added llm-api-key header

Author: DinisCruz

osbot_llms/OSBot_LLMs__Shared_Objects.py

@@ -12,6 +12,7 @@ def s3_db_chat_threads(self):                                               # to
         kwargs      = dict(use_minio   = use_minio   ,
                            server_name =  server_name)
         with  S3_DB__Chat_Threads(**kwargs)  as _:
+            _.bucket_name__insert_account_id    = use_minio is False
             _.setup()                                                           # set up tasks, including creating target bucket if it doesn't exist
             _.s3_key_generator.use_request_path = False
             _.s3_key_generator.use_when         = True

osbot_llms/backend/s3_minio/S3_DB_Base.py

@@ -178,11 +178,6 @@ def setup(self):
 
         if self.s3().bucket_not_exists(bucket_name):
             result = self.s3().bucket_create(**kwargs)
-            # print("========= S3_DB_Base setup=======")
-            # pprint(kwargs)
-            # pprint(self.json())
-            # pprint(result)
-            # print("========= S3_DB_Base setup=======")
             if result.get('status') != 'ok':
                 message = f"""Catastrophic error: Failed to create bucket:
                 

osbot_llms/fast_api/Fast_API__LLMs.py

@@ -5,8 +5,11 @@
 
 
 class Fast_API__LLMs(Fast_API):
-    base_path : str  = '/llms'
+    base_path  : str  = '/llms'
+    enable_cors: bool = True
 
     def setup_routes(self):
         self.add_routes(Routes__Chat)
         self.add_routes(Routes__Info)
+
+

osbot_llms/fast_api/routes/Routes__Chat.py

@@ -3,6 +3,7 @@
 
 from fastapi                                                                import Request
 from fastapi.params import Header, Body
+from osbot_utils.helpers.Random_Guid import Random_Guid
 from osbot_utils.utils.Dev import pprint
 from starlette.responses                                                    import StreamingResponse
 from osbot_fast_api.api.Fast_API_Routes                                     import Fast_API_Routes
@@ -75,7 +76,7 @@ async def simulated_api_call():                         # Simulating the respons
             traceback.print_exc()
 
 
-    async def completion(self, request: Request, llm_chat_completion: LLMs__Chat_Completion = SWAGGER_EXAMPLE__LLMs__Chat_Completion):
+    async def completion(self, request: Request, llm_chat_completion: LLMs__Chat_Completion = SWAGGER_EXAMPLE__LLMs__Chat_Completion, llm_api_key:str = Header(default="xxxx.aaaa.bbbb.xxxx")):
         request_id       = self.request_id(request)
         chat_save_result = self.chats_storage_s3_minio.save_user_request(llm_chat_completion, request_id)
 
@@ -91,12 +92,11 @@ async def completion(self, request: Request, llm_chat_completion: LLMs__Chat_Com
         if user_data and 'selected_platform' in user_data and user_data.get('selected_platform') != 'OpenAI (Paid)':
             response = await self.handle_other_llms(llm_chat_completion, request, request_id)
             if type(response) == StreamingResponse:
-                pass
-                response.headers.append(HEADER_NAME__CHAT_ID       , chat_save_result.get('public_chat_id'        ,''))
-                response.headers.append(HEADER_NAME__CHAT_THREAD_ID, chat_save_result.get('public_chat_thread__id',''))
-                response.headers.append(HEADER_NAME__CHAT_PLATFORM , user_data.get('selected_platform'            ,''))
-                response.headers.append(HEADER_NAME__CHAT_PROVIDER , user_data.get('selected_provider'            ,''))
-                response.headers.append(HEADER_NAME__CHAT_MODEL    , user_data.get('selected_model'               ,''))
+                response.headers.append(HEADER_NAME__CHAT_ID       , chat_save_result.get('public_chat_id'        ) or '')
+                response.headers.append(HEADER_NAME__CHAT_THREAD_ID, chat_save_result.get('public_chat_thread__id') or '')
+                response.headers.append(HEADER_NAME__CHAT_PLATFORM , user_data.get('selected_platform'            ) or '')
+                response.headers.append(HEADER_NAME__CHAT_PROVIDER , user_data.get('selected_provider'            ) or '')
+                response.headers.append(HEADER_NAME__CHAT_MODEL    , user_data.get('selected_model'               ) or '')
             return response
         else:
             stream = llm_chat_completion.stream

tests/integration/backend/s3_minio/test_S3_DB__Chat_Threads.py

@@ -37,10 +37,10 @@ def test_init(self):
     def test__check_setup(self):
         with self.s3_db_chat_threads as _:
             assert _.bucket_exists() is True
-            assert _.s3_bucket() == f'{S3_DB_BASE__BUCKET_NAME__PREFIX}-{aws_config.account_id()}-chat-threads'
-            assert _.json() == { 'bucket_name__insert_account_id': True,
-                                 'bucket_name__prefix'           : S3_DB_BASE__BUCKET_NAME__PREFIX,
-                                 'bucket_name__suffix'           : S3_BUCKET_SUFFIX__CHAT_THREADS ,
+            assert _.s3_bucket() == f'{S3_DB_BASE__BUCKET_NAME__PREFIX}-chat-threads'
+            assert _.json() == { 'bucket_name__insert_account_id': False                                ,
+                                 'bucket_name__prefix'           : S3_DB_BASE__BUCKET_NAME__PREFIX      ,
+                                 'bucket_name__suffix'           : S3_BUCKET_SUFFIX__CHAT_THREADS       ,
                                  's3_key_generator'              : {'root_folder'       : 'chat-threads',
                                                                     's3_path_block_size': 5,
                                                                     'save_as_gz'        : True,

osbot_llms/test__chained_fast_api.py renamed to tests/integration/test__chained_fast_api.py

@@ -31,7 +31,7 @@ def test__setUpClass(self):
         assert type(self.s3_db_chat_threads)             is S3_DB__Chat_Threads
         assert self.s3_db_chat_threads.bucket_exists()   is True
         assert aws_config.account_id()                   == self.random_aws_creds.env_vars['AWS_ACCOUNT_ID']
-        assert self.s3_db_chat_threads.s3_bucket()       == f'{S3_DB_BASE__BUCKET_NAME__PREFIX}-{aws_config.account_id()}-chat-threads'
+        assert self.s3_db_chat_threads.s3_bucket()       == f'{S3_DB_BASE__BUCKET_NAME__PREFIX}-chat-threads'
         assert self.s3_db_chat_threads.use_minio         is True
         assert self.s3_db_chat_threads.server_name       == 'osbot-llms'
 

tests/integration/testing/test_TestCase__S3_Minio__Temp_Chat_Threads.py

@@ -0,0 +1,34 @@
+from unittest import TestCase
+
+import pytest
+import requests
+from osbot_utils.utils.Dev import pprint
+from osbot_utils.utils.Env import get_env
+from osbot_utils.utils.Objects import dict_to_obj, base_types
+
+from osbot_llms.models.LLMs__Chat_Completion import LLMs__Chat_Completion
+
+ENV_NAME__URL_LIVE_SERVER = 'URL_LIVE_SERVER'
+DEFAULT_URL_LIVE_SERVER   = 'http://localhost:5010'
+
+@pytest.mark.skip("Wire up to CI pipline")
+class test_Live_Server(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.live_server = get_env(ENV_NAME__URL_LIVE_SERVER, DEFAULT_URL_LIVE_SERVER)
+
+    def test_server_connection(self):
+        response = requests.get(self.live_server, allow_redirects=False)
+        assert response.status_code == 307
+        assert dict_to_obj(dict(response.headers)).location == '/docs'
+
+    def test_open_api(self):
+        response = dict_to_obj(requests.get(self.live_server+'/openapi.json').json())
+        assert response.info.title                      == 'FastAPI'
+        assert getattr(response.paths, '/').get.summary == 'Redirect To Docs'
+
+    def test__chat__completion(self):
+        llms_chat_completion = LLMs__Chat_Completion(stream=False)
+        response = requests.post(self.live_server + '/chat/completion', json=llms_chat_completion.json())
+        assert response.text == '"no engine"'