Merge branch main into brian/converse-api-integration

src/e84_geoai_common/llm/models/nova.py

@@ -22,11 +22,11 @@
 
 # https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html#model-ids-arns
 NOVA_BEDROCK_MODEL_IDS = {
-    "Nova Canvas": "us.amazon.nova-canvas-v1:0",
-    "Nova Lite": "us.amazon.nova-lite-v1:0",
-    "Nova Micro": "us.amazon.nova-micro-v1:0",
-    "Nova Pro": "us.amazon.nova-pro-v1:0",
-    "Nova Reel": "us.amazon.nova-reel-v1:0",
+    "Nova Canvas": "amazon.nova-canvas-v1:0",
+    "Nova Lite": "amazon.nova-lite-v1:0",
+    "Nova Micro": "amazon.nova-micro-v1:0",
+    "Nova Pro": "amazon.nova-pro-v1:0",
+    "Nova Reel": "amazon.nova-reel-v1:0",
 }
 
 
@@ -237,8 +237,6 @@ def prompt(
             raise ValueError(msg)
         request = self._create_request(messages, inference_cfg)
         response = self.invoke_model_with_request(request)
-        # log.info(response.output)
-        log.info(response)
         return response.output.message.to_llm_message(inference_cfg)
 
     @timed_function
@@ -265,13 +263,7 @@ def invoke_model_with_request(self, request: NovaInvokeLLMRequest) -> NovaRespon
 
 # llm = BedrockNovaLLM()
 # config = LLMInferenceConfig()
-# resp = llm.prompt(
-#     messages=[
-#         LLMMessage(content="repeat 'hello' backwards"),
-#         LLMMessage(role="assistant", content="what is 10+10?")
-#     ],
-#     inference_cfg=config
-# )
+# resp = llm.prompt(messages=[LLMMessage(content="hello")], inference_cfg=config)
 # print(resp.model_dump_json(indent=2))
 
 

src/e84_geoai_common/llm/tests/mock_bedrock.py

@@ -18,7 +18,6 @@
 USE_REAL_BEDROCK_CLIENT = os.getenv("USE_REAL_BEDROCK_CLIENT") == "true"
 
 
-
 def _string_to_streaming_body(string_data: str) -> StreamingBody:
     bytes_data = string_data.encode("utf-8")
     stream = BytesIO(bytes_data)