Refactoring client and providers. #27

rohitprasad15 · 2024-09-11T13:41:30Z

Added Azure support & refactored code.
Refactoring includes -

ProviderFactory.
Lazily import the provider based on config passed to Client.

Added Azure support & refactored code. Refactoring includes - - ProviderFactory provides a specific provider impl. - Lazily import the provider based on config passed to Client. - Reduced the number of files.

Added back few older files. Replaced test_client with newer test code. Will need to port the older provider files to the new format. Till then keeping the older provider interface related tests.

Changed client.ipynb

ksolo · 2024-09-12T03:51:03Z

aisuite/client.py

+        """
+        Initialize the client with provider configurations.
+        Use the ProviderFactory to create provider instances.
+        """


Since the provider_configs is a simple dict, it could be helpful to add the args to doc string to explain what type of data is expected.

Done, thanks!

aisuite/client.py

aisuite/provider.py

ksolo · 2024-09-12T04:11:54Z

aisuite/providers/aws_bedrock_provider.py

+# Used to call the AWS Bedrock converse API
+# Converse API provides consistent API, that works with all Amazon Bedrock models that support messages.
+# Eg: anthropic.claude-v2,
+#     meta.llama3-70b-instruct-v1:0,
+#     mistral.mixtral-8x7b-instruct-v0:1
+# The model value can be a baseModelId or provisionedModelArn.
+# Using a base model id gives on-demand throughput.
+# Use CreateProvisionedModelThroughput API to get provisionedModelArn for higher throughput.
+# https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html


Suggestion: Make this a doc string for the module.

done, thanks!

aisuite/providers/aws_bedrock_provider.py

ksolo · 2024-09-12T04:18:04Z

aisuite/providers/azure_provider.py

+        headers = {"Content-Type": "application/json", "Authorization": self.api_key}
+
+        try:
+            req = urllib.request.Request(url, body, headers)


I recommend using httpx for the requests.

agreed. will send a follow up PR for this.

ksolo · 2024-09-12T04:19:03Z

aisuite/providers/gcp_provider.py

+from aisuite.provider import Provider
+
+
+class GcpProvider(Provider):


I think Andrew wanted this named Google instead of GCP. I'm fine either way.

agreed. i will sync up with him change this. i am divided between glcoud and google, similar to how "aws" is preferred over amazon.

ksolo · 2024-09-12T04:21:10Z

tests/client/test_client.py

-    assert isinstance(interface, AnthropicInterface)
-    assert model_name == "some-model:v1"
-    assert client.all_interfaces["anthropic"] == interface
+class TestClient(unittest.TestCase):


We were using pytest before are you open to that or would you prefer the unittest?

i saw later that we already use pytest. I will migrate it in the follow-up PR.

rohitprasad15

Thanks for your review. I have addressed the suggestions.
There are few things I will address in follow up PR - like moving to pytest instead of unittest, and chaning the gcp_provider file name.

aisuite/client.py

rohitprasad15 · 2024-09-12T18:22:43Z

aisuite/client.py

+        """
+        Initialize the client with provider configurations.
+        Use the ProviderFactory to create provider instances.
+        """


Done, thanks!

aisuite/client.py

aisuite/provider.py

rohitprasad15 · 2024-09-12T18:38:29Z

aisuite/providers/aws_bedrock_provider.py

+# Used to call the AWS Bedrock converse API
+# Converse API provides consistent API, that works with all Amazon Bedrock models that support messages.
+# Eg: anthropic.claude-v2,
+#     meta.llama3-70b-instruct-v1:0,
+#     mistral.mixtral-8x7b-instruct-v0:1
+# The model value can be a baseModelId or provisionedModelArn.
+# Using a base model id gives on-demand throughput.
+# Use CreateProvisionedModelThroughput API to get provisionedModelArn for higher throughput.
+# https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html


done, thanks!

aisuite/providers/aws_bedrock_provider.py

rohitprasad15 · 2024-09-12T18:39:20Z

aisuite/providers/azure_provider.py

+        headers = {"Content-Type": "application/json", "Authorization": self.api_key}
+
+        try:
+            req = urllib.request.Request(url, body, headers)


agreed. will send a follow up PR for this.

rohitprasad15 · 2024-09-12T18:40:33Z

aisuite/providers/gcp_provider.py

+from aisuite.provider import Provider
+
+
+class GcpProvider(Provider):


agreed. i will sync up with him change this. i am divided between glcoud and google, similar to how "aws" is preferred over amazon.

rohitprasad15 · 2024-09-12T18:43:40Z

tests/client/test_client.py

-    assert isinstance(interface, AnthropicInterface)
-    assert model_name == "some-model:v1"
-    assert client.all_interfaces["anthropic"] == interface
+class TestClient(unittest.TestCase):


i saw later that we already use pytest. I will migrate it in the follow-up PR.

aisuite/client.py

rohitprasad15 requested review from standsleeping and ksolo September 11, 2024 16:55

Refactoring client and providers.

d9ede71

Added Azure support & refactored code. Refactoring includes - - ProviderFactory provides a specific provider impl. - Lazily import the provider based on config passed to Client. - Reduced the number of files.

rohitprasad15 force-pushed the rp_Refactoring branch from c44c25d to d9ede71 Compare September 11, 2024 17:40

rohit-rptless added 3 commits September 11, 2024 11:35

Added older provider interface back for tests to pass.

fca12d3

Added back few older files. Replaced test_client with newer test code. Will need to port the older provider files to the new format. Till then keeping the older provider interface related tests.

Minor changes for making tests pass.

7d6d3a4

Allowing provider name as string in config()

510b881

Changed client.ipynb

ksolo reviewed Sep 12, 2024

View reviewed changes

Addressing review comments.

5236a96

rohitprasad15 commented Sep 12, 2024

View reviewed changes

ksolo approved these changes Sep 12, 2024

View reviewed changes

aisuite/client.py Show resolved Hide resolved

rohitprasad15 merged commit d77f312 into main Sep 12, 2024
8 checks passed

rohitprasad15 deleted the rp_Refactoring branch September 13, 2024 16:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactoring client and providers. #27

Refactoring client and providers. #27

rohitprasad15 commented Sep 11, 2024

ksolo Sep 12, 2024

rohitprasad15 Sep 12, 2024

ksolo Sep 12, 2024

rohitprasad15 Sep 12, 2024

ksolo Sep 12, 2024

rohitprasad15 Sep 12, 2024

ksolo Sep 12, 2024

rohitprasad15 Sep 12, 2024

ksolo Sep 12, 2024

rohitprasad15 Sep 12, 2024

rohitprasad15 left a comment

rohitprasad15 Sep 12, 2024

rohitprasad15 Sep 12, 2024

rohitprasad15 Sep 12, 2024

rohitprasad15 Sep 12, 2024

rohitprasad15 Sep 12, 2024

		from aisuite.provider import Provider


		class GcpProvider(Provider):

Refactoring client and providers. #27

Refactoring client and providers. #27

Conversation

rohitprasad15 commented Sep 11, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rohitprasad15 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment