dev step

logs/function.output.log

@@ -0,0 +1,18 @@
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': 'assistant', 'tool_calls': None}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': 'call_1lF6wX8Fl9qIDabi0eN1agXL', 'function': {'arguments': '', 'name': 'buscar_google'}, 'type': 'function'}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': None, 'function': {'arguments': '{"bu', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': None, 'function': {'arguments': 'squed', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': None, 'function': {'arguments': 'a": "n', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': None, 'function': {'arguments': 'otic', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': None, 'function': {'arguments': 'ias d', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': None, 'function': {'arguments': 'e hoy"', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 0, 'id': None, 'function': {'arguments': '}', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': 'call_Hqn7hcl7lEcD87e22JTyHqVf', 'function': {'arguments': '', 'name': 'buscar_google'}, 'type': 'function'}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': None, 'function': {'arguments': '{"bu', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': None, 'function': {'arguments': 'squed', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': None, 'function': {'arguments': 'a": "ú', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': None, 'function': {'arguments': 'ltim', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': None, 'function': {'arguments': 'as no', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': None, 'function': {'arguments': 'ticias', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': [{'index': 1, 'id': None, 'function': {'arguments': '"}', 'name': None}, 'type': None}]}, 'finish_reason': None, 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}
+{'id': 'chatcmpl-8YgAMqR5wAbKdaFDxrtFsM0CVOaWd', 'choices': [{'delta': {'content': None, 'function_call': None, 'role': None, 'tool_calls': None}, 'finish_reason': 'tool_calls', 'index': 0, 'logprobs': None}], 'created': 1703275930, 'model': 'gpt-3.5-turbo-1106', 'object': 'chat.completion.chunk', 'system_fingerprint': 'fp_772e8125bb'}

main.py

@@ -139,17 +139,15 @@ async def get_token(response: Response, user: User_find_from_data):
 
 @app.post("/chat")
 async def chat_async(session: Session_find_from_data):
-    body = model.Chat(messages = session.data["messages"])
-    if(len(body.messages) < 1 or body.messages[-1].content==""):
+    chat = model.Chat(messages = session.data["messages"])
+    if(len(chat.messages) < 1 or chat.messages[-1].content==""):
         log_module.logger.warning(session.gid, "Mensaje RQ", "error, mensajes vacios")
         raise HTTPException(
             status_code=status.HTTP_418_IM_A_TEAPOT,
             detail= "Nope"
         )
     
-    response_async = llm.ejecutar(body, session)
-    
-    return StreamingResponse(llm.streamer(response_async, body, session), media_type="application/json")
+    return StreamingResponse(llm.streamer(chat, session), media_type="application/json")
 
 
 ########################## Static Pages ##########################    

modules/llm.py

@@ -61,27 +61,42 @@ def manejar_funciones(chunk, response_async, data):
             })
     return json.dumps(f_cb), ejecutar(data)
 
-async def streamer(response_async, body, session):
+async def streamer(chat: "model.Chat", session: "model.Session"):
+    response_async = ejecutar(chat, session)
+    
+    
+    
     yield json.dumps({"comando": "status", "status":{"mensaje":"Cargando", "modo": "reemplazar"}})
-    message = body.new_msg()
+    message = chat.new_msg()
     
     st = time.time()
     st_times = 0
-    
+    function_exec = {
+        "name": "",
+        "args": ""
+    }
     for chunk in response_async:
+        print(chunk.model_dump())
         choise = chunk.choices[0]
         delta = choise.delta
         
         message.tokensOutput += 1
-        if choise.finish_reason=="stop":
+        if choise.finish_reason in ["stop", "tool_calls"]:
             break
 
-        if delta.role:
+        elif delta.role:
             message.role = delta.role
             continue
         
-        if delta.content:
+        elif delta.content:
             message.content += delta.content
+            
+        elif delta.tool_calls:
+            if(name := delta.tool_calls[0].function.name):
+                function_exec["name"] = name
+            if(args := delta.tool_calls[0].function.arguments):
+                function_exec["args"] += args
+            
         
         if time.time() - st > 3:
             if st_times > 2:
@@ -91,9 +106,11 @@ async def streamer(response_async, body, session):
                 yield json.dumps({"comando": "status", "status":{"mensaje":".", "modo": "enlinea"}})
                 st_times += 1
             st = time.time()
-    message.tokensPrompt = body.tokens 
+    message.tokensPrompt = chat.tokens 
     session.update_usage(message)
     
+    
+    
     yield json.dumps({"comando":"challenge", "challenge": session.challenge} )
     yield json.dumps({"comando":"token", "token": session.create_cookie_token() } )
     yield json.dumps({"comando":"mensaje", "mensaje": message.model_dump()} )

modules/settings.py

@@ -1,27 +1,39 @@
 import os, json
 
 from datetime import timezone, timedelta
+from modules import log_module
 from Crypto.Random import get_random_bytes
 
+def environ_get(variable, required=False):
+    if variable not in os.environ:
+        log_module.logger.warning(f" Variable not set {variable}")
+        if not required:
+            return None
+    return os.environ[variable]
+
 TZ = timezone(timedelta(hours=-4))
 
-GPT_MODEL = "gpt-3.5-turbo-1106"
+GPT_MODEL = environ_get("GPT_MODEL", True)
 
-MONGO_URL = os.environ.get("MONGO_URL", None)
-MONGO_PWD = os.environ.get("MONGO_PWD", None)
-MONGO_USR = os.environ.get("MONGO_USR", None)
+MONGO_URL = environ_get("MONGO_URL")
+MONGO_PWD = environ_get("MONGO_PWD")
+MONGO_USR = environ_get("MONGO_USR")
 DB_URI = f"mongodb+srv://{MONGO_USR}:{MONGO_PWD}@{MONGO_URL}/?retryWrites=true&w=majority"
+DB_URI = "mongodb://127.0.0.1:27017"
 
-OPENAI_API_KEY=os.environ.get('OPENAI_API_KEY')
 
-USERS = json.loads(str(os.getenv("USER_KEYS")).replace("\n", ""))
+OPENAI_API_KEY=environ_get('OPENAI_API_KEY', True)
+USERS = json.loads(str(environ_get("USER_KEYS", True)).replace("\n", ""))
 
-JWT_SECRET = os.environ.get('JWT_SECRET')
+JWT_SECRET = environ_get('JWT_SECRET', True)
 
 JWT_ALGORITHM = "HS256"
 JWT_EXPIRATION_TIME_MINUTES_API = 7*24*60
 JWT_EXPIRATION_TIME_MINUTES_VIEW = 7*24*60
 
-GOOGLE_CLIENT_ID = os.environ.get("GOOGLE_CLIENT_ID")
-GOOGLE_CLIENT_SECRET = os.environ.get("GOOGLE_CLIENT_SECRET")
-OAUTH_REDIRECT = os.environ.get("OAUTH_REDIRECT")
+GOOGLE_CLIENT_ID = environ_get("GOOGLE_CLIENT_ID", True)
+GOOGLE_CLIENT_SECRET = environ_get("GOOGLE_CLIENT_SECRET", True)
+GOOGLE_API_KEY = environ_get("GOOGLE_API_KEY")
+GOOGLE_CSE_ID = environ_get("GOOGLE_CSE_ID")
+
+OAUTH_REDIRECT = os.environ.get("OAUTH_REDIRECT", True)