From b7741c3482be9788faef89f14f9f819f0b5a7228 Mon Sep 17 00:00:00 2001 From: Abhijit L Date: Mon, 28 Jul 2025 09:05:48 +0530 Subject: [PATCH 1/2] fix: model sdk e2e tests --- examples/azure-openai/azure-universal.py | 2 +- examples/bedrock/bedrock_client_universal.py | 2 +- examples/bedrock/bedrock_general_route.py | 14 +++++++------- examples/openai/openai_general_route.py | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/azure-openai/azure-universal.py b/examples/azure-openai/azure-universal.py index 7def2ed..dc8297f 100644 --- a/examples/azure-openai/azure-universal.py +++ b/examples/azure-openai/azure-universal.py @@ -30,7 +30,7 @@ def initialize_client(): print("AZURE_OPENAI_API_KEY found.") # Create the Azure client - azure_client = AzureOpenAI(api_version="2023-09-15-preview") + azure_client = AzureOpenAI(api_version="2023-09-15-preview", base_url="") # Initialize the Javelin client and register the Azure client config = JavelinConfig(javelin_api_key=javelin_api_key) diff --git a/examples/bedrock/bedrock_client_universal.py b/examples/bedrock/bedrock_client_universal.py index 7e6858a..c7b06a6 100644 --- a/examples/bedrock/bedrock_client_universal.py +++ b/examples/bedrock/bedrock_client_universal.py @@ -26,7 +26,7 @@ def init_bedrock(): ) javelin_client = JavelinClient(config) javelin_client.register_bedrock( - bedrock_runtime_client=bedrock_runtime_client, bedrock_client=bedrock_client + bedrock_runtime_client=bedrock_runtime_client, bedrock_client=bedrock_client, bedrock_session=None, route_name="amazon" ) return bedrock_runtime_client diff --git a/examples/bedrock/bedrock_general_route.py b/examples/bedrock/bedrock_general_route.py index 35c3853..ce52679 100644 --- a/examples/bedrock/bedrock_general_route.py +++ b/examples/bedrock/bedrock_general_route.py @@ -58,7 +58,7 @@ def get_bedrock_client(): aws_secret_access_key = os.getenv("AWS_SECRET_ACCESS_KEY", "YOUR_SECRET_KEY") bedrock_api_key = os.getenv("JAVELIN_API_KEY", "YOUR_BEDROCK_API_KEY") - custom_headers = {"x-javelin-apikey": bedrock_api_key} + custom_headers = {"x-javelin-apikey": bedrock_api_key, "x-javelin-route": "amazon"} client = boto3.client( service_name="bedrock-runtime", @@ -115,7 +115,7 @@ def call_bedrock_model_invoke(client, route_name, input_text): # ------------------------------- -def call_bedrock_model_converse(client, route_name, user_topic): +def call_bedrock_model_converse(client, model_id, user_topic): """ Non-streaming call. Roles must be 'user' or 'assistant'. The user role includes the required @@ -123,7 +123,7 @@ def call_bedrock_model_converse(client, route_name, user_topic): """ try: response = client.converse( - modelId=route_name, + modelId=model_id, messages=[ { "role": "user", @@ -167,10 +167,10 @@ def main(): # 2) Invoke (non-streaming) print("\n--- Bedrock: Invoke (non-streaming) ---") try: - route_invoke = "claude_haiku_invoke" # Adjust if your route name differs + model_id = "anthropic.claude-v2" # Adjust if your route name differs input_text_invoke = "sunset on a winter evening" raw_invoke_output = call_bedrock_model_invoke( - bedrock_client, route_invoke, input_text_invoke + bedrock_client, model_id, input_text_invoke ) final_invoke_text = extract_final_text(raw_invoke_output) print(final_invoke_text) @@ -180,10 +180,10 @@ def main(): # 3) Converse (non-streaming) print("\n--- Bedrock: Converse (non-streaming) ---") try: - route_converse = "claude_haiku_converse" # Adjust if your route name differs + model_id = "anthropic.claude-v2" # Adjust if your route name differs user_topic = "a tranquil mountain pond" raw_converse_output = call_bedrock_model_converse( - bedrock_client, route_converse, user_topic + bedrock_client, model_id, user_topic ) final_converse_text = extract_final_text(raw_converse_output) print(final_converse_text) diff --git a/examples/openai/openai_general_route.py b/examples/openai/openai_general_route.py index c1e2eed..1ed1052 100644 --- a/examples/openai/openai_general_route.py +++ b/examples/openai/openai_general_route.py @@ -21,7 +21,7 @@ def init_sync_openai_client(): # This client is configured for chat completions. return OpenAI( api_key=openai_api_key, - base_url=f"{os.getenv('JAVELIN_BASE_URL')}/v1/query/openai", + base_url=f"{os.getenv('JAVELIN_BASE_URL')}/v1", default_headers=javelin_headers, ) except Exception as e: @@ -36,7 +36,7 @@ def init_async_openai_client(): javelin_headers = {"x-javelin-apikey": javelin_api_key} return AsyncOpenAI( api_key=openai_api_key, - base_url="https://api-dev.javelin.live/v1/query/openai", + base_url=f"{os.getenv('JAVELIN_BASE_URL')}/v1", default_headers=javelin_headers, ) except Exception as e: From 2f9bec4de0edb4179b1579d0cb9d003beae8172c Mon Sep 17 00:00:00 2001 From: Abhijit L Date: Mon, 28 Jul 2025 10:06:36 +0530 Subject: [PATCH 2/2] fix: lint issue --- examples/bedrock/bedrock_client_universal.py | 5 ++++- examples/bedrock/bedrock_general_route.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/examples/bedrock/bedrock_client_universal.py b/examples/bedrock/bedrock_client_universal.py index c7b06a6..204bd8e 100644 --- a/examples/bedrock/bedrock_client_universal.py +++ b/examples/bedrock/bedrock_client_universal.py @@ -26,7 +26,10 @@ def init_bedrock(): ) javelin_client = JavelinClient(config) javelin_client.register_bedrock( - bedrock_runtime_client=bedrock_runtime_client, bedrock_client=bedrock_client, bedrock_session=None, route_name="amazon" + bedrock_runtime_client=bedrock_runtime_client, + bedrock_client=bedrock_client, + bedrock_session=None, + route_name="amazon", ) return bedrock_runtime_client diff --git a/examples/bedrock/bedrock_general_route.py b/examples/bedrock/bedrock_general_route.py index ce52679..cc53ee5 100644 --- a/examples/bedrock/bedrock_general_route.py +++ b/examples/bedrock/bedrock_general_route.py @@ -58,7 +58,10 @@ def get_bedrock_client(): aws_secret_access_key = os.getenv("AWS_SECRET_ACCESS_KEY", "YOUR_SECRET_KEY") bedrock_api_key = os.getenv("JAVELIN_API_KEY", "YOUR_BEDROCK_API_KEY") - custom_headers = {"x-javelin-apikey": bedrock_api_key, "x-javelin-route": "amazon"} + custom_headers = { + "x-javelin-apikey": bedrock_api_key, + "x-javelin-route": "amazon", + } client = boto3.client( service_name="bedrock-runtime",