Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Release 2023.06.30 #66

Merged
merged 47 commits into from
Jun 30, 2023
Merged

New Release 2023.06.30 #66

merged 47 commits into from
Jun 30, 2023

Conversation

vedem1192
Copy link
Contributor

Status

READY

Description

Watsonx Prompt Templates
Updated documentation and examples
Retry mechanism update

vdemers and others added 30 commits June 8, 2023 15:50
moved PR from local to forked repo
2a1a612
Replaced imports
44e6f18
Renamed PromptServiceInterface as PromptTemplateManager
0ad10cc
Added test for PromptTemplateManager
6deabeb
Fixed linting with pre-commit
deded49
Added test for from_watsonx logic
5efbf0f
@onkarbhardwaj
Retry strategy and use semaphores to prevent a large number of tasks …
0126a83 
…getting created

Signed-off-by: Onkar Bhardwaj <onkarbhardwaj@ibm.com>
@onkarbhardwaj
Dev example for retry-backoff
d17d469 
Signed-off-by: Onkar Bhardwaj <onkar.bhardwaj@gmail.com>
Async generate now works with new options object, tokenize aligned wi…
2d0c597 
…th passing options as well, fixed bug in tokenize async where we could not pass the return_token argument, made async examples
Ran pre-commit
5dd067b
Merge remote-tracking branch 'IBM/develop' into feature/prompt-templa…
5176cc7 
…ting
@onkarbhardwaj
Informative error messages in async generator and type change in GenA…
8ff0a05 
…I exception (#57)
@mirianfsilva
update greedy examples removing incompatible params (#59)
5f9a2e0
@jpwsutton
Fix/setup cfg (#49)
e898e2e 
* fix: including README in pypi deployment

* fix: adding build dependency and changing workflow to use it

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
@onkarbhardwaj
Merge branch 'develop' into retry
d2fef7a 
Signed-off-by: Onkar Bhardwaj <onkar.bhardwaj@gmail.com>
@vedem1192 @onkarbhardwaj
Update src/genai/options.py
5e65be9 
Co-authored-by: Onkar Bhardwaj <onkar.bhardwaj@gmail.com>
Signed-off-by: Veronique <veronique_1192@hotmail.com>
@vedem1192
Merge pull request #27 from vedem1192/feature/prompt-templating
5d3bfb7 
Feature/prompt templating
@mirianfsilva
Merge branch 'develop' into retry
9c4459c 
Signed-off-by: Mírian Silva <mirianfrsilva@ibm.com>
docs: swapped modeltype to str, connected prompts to files
60f38af 
- Swapped ModelType enums to str on examples
- Connected annex files to the existing files under prompts
- Connected a prompt example to the example file
- Swapped not supported model name

Contributes to: #24

Signed-off-by: Ja Young Lee <younglee@ibm.com>
docs: removed a line from connected prompt example
2c1e93a 
- updated included line numbers on a prompt example

Contributes to: #24

Signed-off-by: Ja Young Lee <younglee@ibm.com>
@onkarbhardwaj
Fixing missing options argument in async_generator.py
d17bf14 
Signed-off-by: Onkar Bhardwaj <onkar.bhardwaj@gmail.com>
@onkarbhardwaj
dev example for retry: change function signature to include options
45ae7f6
@moneill0
fix: set temps for sampling mode to more than zero
e4069ea 
Signed-off-by: Mairead O'Neill <moneill@ibm.com>
@mirianfsilva
add options - flaky async dev example
60effd7 
Signed-off-by: Mírian Silva <mirianfrsilva@ibm.com>
docs: swapped unavailable model, updated endpoint info on readme, upd…
0241d56 
…ated generate param info

- Swapped unavailable model on examples
- Updated undpoint section on Readme to have more information
- Updated Readme's API link to bold
- Swapped ModelType to string in Readme
- Updated parameter information of GenerateParams about invalid ones with greedy decoding

Contributes to: #24

Signed-off-by: Ja Young Lee <younglee@ibm.com>
@moneill0
fix: removed params from greedy method
03e600e 
Signed-off-by: Mairead O'Neill <moneill@ibm.com>
@moneill0
Merge branch 'develop' into 63-Set_right_temp
2f8363d
@jpwsutton @moneill0
chore: updating package versions (#35)
41c29f1 
Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
@moneill0
git rebasing
7ebca81 
Signed-off-by: Mairead O'Neill <moneill@ibm.com>
@moneill0
Updated readme with pre-requisites
694359b 
Signed-off-by: Mairead O'Neill <moneill@ibm.com>
moneill0 and others added 16 commits June 29, 2023 15:13
@moneill0
fix: fixed lint issue
ddcdb7b 
Signed-off-by: Mairead O'Neill <moneill@ibm.com>
@moneill0
docs: changed link to docs, readme syntax
4a36274 
Signed-off-by: Mairead O'Neill <moneill@ibm.com>
@ameza13 @moneill0
Open-source info updates (#31)
11268a8
@jpwsutton @moneill0
fix: installing extensions for integration tests
fb6229b 
Signed-off-by: James Sutton <jsutton@li-dcf9314c-2cb7-11b2-a85c-ee3a6b9d026b.ibm.com>
Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
@moneill0
docs: example spelling fix, added api_url to readme
d12099c 
- Fixed spellings on examples
- Added API_URL examples to README

Contributes to: #24

Signed-off-by: Ja Young Lee <younglee@ibm.com>
@moneill0
docs: fixed wrong url
add449d 
- fixed wrong link on the documentation

Contributes to: #24

Signed-off-by: Ja Young Lee <younglee@ibm.com>
@jayolee @moneill0
docs: updated links (#51)
610aabe 
- Fixed wrong links on documentations

Contributes to: #24

Signed-off-by: Ja Young Lee <younglee@ibm.com>
Co-authored-by: Ja Young Lee <younglee@ibm.com>
@moneill0
Removed async examples from integration testing
ad22966
@onkarbhardwaj @mirianfsilva
@jpwsutton @moneill0
New Release (#60)
b9cf4ef 
* Informative error messages in async generator and type change in GenAI exception (#57)

* update greedy examples removing incompatible params (#59)

* Fix/setup cfg (#49)

* fix: including README in pypi deployment

* fix: adding build dependency and changing workflow to use it


Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
Co-authored-by: Mírian Silva <mirianfrsilva@ibm.com>
Co-authored-by: James Sutton <1068763+jpwsutton@users.noreply.github.com>
@moneill0
Merge branch 'develop' into 63-Set_right_temp
366a7e7
@onkarbhardwaj @mirianfsilva
Update examples/dev/async-flaky-request-handler.py
83d8f7a 
Co-authored-by: Mírian Silva <mirianfrsilva@gmail.com>
Signed-off-by: Onkar Bhardwaj <onkar.bhardwaj@gmail.com>
@moneill0
Merge remote-tracking branch 'IBM/develop' into 63-Set_right_temp
1f0373a
@vedem1192
Merge pull request #65 from moneill0/63-Set_right_temp
65835f2 
63 set right temp
@vedem1192
Merge pull request #36 from onkarbhardwaj/retry
c5105c7 
Retry strategy and use semaphores to prevent creating a large number of async tasks
@vedem1192
Merge pull request #64 from mirianfsilva/hotfix/async-examples
22c2a1f 
hotfix/async dev example
@vedem1192
Merge pull request #62 from jayolee/24-docs-modeltype-to-str
142a866 
docs: swapped modeltype to str, connected prompts to files
@coveralls
Copy link

Pull Request Test Coverage Report for Build 5425529749

  • 255 of 277 (92.06%) changed or added relevant lines in 14 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.5%) to 94.737%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/genai/options.py 9 12 75.0%
src/genai/services/prompt_template_manager.py 103 106 97.17%
src/genai/routers/prompt_template.py 36 41 87.8%
src/genai/utils/watsonx_helpers.py 1 12 8.33%
Totals Coverage Status
Change from base Build 5357896957: 0.5%
Covered Lines: 1242
Relevant Lines: 1311
💛 - Coveralls

1 similar comment
@coveralls
Copy link

coveralls commented Jun 30, 2023 •
edited
Loading

Pull Request Test Coverage Report for Build 5425529749

  • 255 of 277 (92.06%) changed or added relevant lines in 14 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.5%) to 94.737%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/genai/options.py 9 12 75.0%
src/genai/services/prompt_template_manager.py 103 106 97.17%
src/genai/routers/prompt_template.py 36 41 87.8%
src/genai/utils/watsonx_helpers.py 1 12 8.33%
Totals Coverage Status
Change from base Build 5357896957: 0.5%
Covered Lines: 1242
Relevant Lines: 1311
💛 - Coveralls

@vedem1192 vedem1192 temporarily deployed to integration-tests June 30, 2023 17:45 — with GitHub Actions Inactive
onkarbhardwaj
onkarbhardwaj approved these changes Jun 30, 2023
View reviewed changes
Copy link
Contributor

@onkarbhardwaj onkarbhardwaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Examples run successfully, tests pass. Good to go.

@onkarbhardwaj onkarbhardwaj merged commit 44fea57 into main Jun 30, 2023
8 checks passed
vedem1192 added a commit that referenced this pull request Jun 30, 2023
@vedem1192
Merge pull request #71 from IBM/main
16fe2fc 
New Release 2023.06.30 (#66)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onkarbhardwaj onkarbhardwaj onkarbhardwaj approved these changes

@mirianfsilva mirianfsilva mirianfsilva approved these changes

@jayolee jayolee jayolee approved these changes

@ameza13 ameza13 Awaiting requested review from ameza13

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@vedem1192 @coveralls @onkarbhardwaj @mirianfsilva @jayolee @jpwsutton @moneill0 @ameza13