Mejoras generales y pruebas

.gitattributes

@@ -1,34 +1,34 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.arrow filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.ckpt filter=lfs diff=lfs merge=lfs -text
+*.ftz filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.h5 filter=lfs diff=lfs merge=lfs -text
+*.joblib filter=lfs diff=lfs merge=lfs -text
+*.lfs.* filter=lfs diff=lfs merge=lfs -text
+*.mlmodel filter=lfs diff=lfs merge=lfs -text
+*.model filter=lfs diff=lfs merge=lfs -text
+*.msgpack filter=lfs diff=lfs merge=lfs -text
+*.npy filter=lfs diff=lfs merge=lfs -text
+*.npz filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text
+*.ot filter=lfs diff=lfs merge=lfs -text
+*.parquet filter=lfs diff=lfs merge=lfs -text
+*.pb filter=lfs diff=lfs merge=lfs -text
+*.pickle filter=lfs diff=lfs merge=lfs -text
+*.pkl filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.pth filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.safetensors filter=lfs diff=lfs merge=lfs -text
+saved_model/**/* filter=lfs diff=lfs merge=lfs -text
+*.tar.* filter=lfs diff=lfs merge=lfs -text
+*.tflite filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.wasm filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
+*tfevents* filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,4 +1,5 @@
-.history/
-.vscode/
-__pycache__/
-keys/
+.history/
+.vscode/
+__pycache__/
+keys/
+.env

Dockerfile

@@ -1,21 +1,21 @@
-FROM python:3.9
-
-WORKDIR /code
-COPY ./requirements.txt /code/requirements.txt
-
-
-RUN useradd -m -u 1000 user
-
-USER user
-
-ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
-
-WORKDIR $HOME/app
-
-
-COPY --chown=user . $HOME/app
-RUN pip install --user --no-cache-dir --upgrade -r /code/requirements.txt
-#CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
-CMD ["hypercorn", "main:app", "--workers", "6", "--bind", "0.0.0.0:7860"]
-
+FROM python:3.11
+
+WORKDIR /code
+COPY ./requirements.txt /code/requirements.txt
+
+
+RUN useradd -m -u 1000 user
+
+USER user
+
+ENV HOME=/home/user \
+	PATH=/home/user/.local/bin:$PATH
+
+WORKDIR $HOME/app
+
+
+COPY --chown=user . $HOME/app
+RUN pip install --user --no-cache-dir --upgrade -r /code/requirements.txt
+#CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
+CMD ["hypercorn", "main:app", "--workers", "6", "--bind", "0.0.0.0:7860"]
+

chat_functions/__init__.py

@@ -0,0 +1,23 @@
+functions = []
+function_callbacks = {}
+function_user_text = {}
+import importlib 
+import glob
+
+
+# Obtiene la lista de archivos .py en la carpeta actual
+archivos = glob.glob("*.py", root_dir=__path__[0])
+
+# Recorre cada archivo y lee la variable "info" dentro de ellos
+for archivo in archivos:
+    if "__" in archivo[:-3]:
+        continue
+    # Importa el módulo del archivo
+    modulo = importlib.import_module('.'+archivo[:-3], "chat_functions")
+    if not modulo.activo:
+        continue
+    # Lee la variable "info" del módulo
+    
+    functions.append(modulo.info)
+    function_callbacks[modulo.info["name"]] = modulo.ejecutar
+    function_user_text[modulo.info["name"]] = modulo.user_text

chat_functions/buscar_google.py

@@ -0,0 +1,76 @@
+import json
+import os
+from googleapiclient.discovery import build
+from logger import logger
+
+activo = True
+try:
+    api_key = os.getenv("GOOGLE_API_KEY")
+    cse_id = os.getenv("GOOGLE_CSE_ID")
+except:
+    api_key = False
+    cse_id = False
+if not api_key or not cse_id:
+    activo = False
+
+user_text = "Buscando en google"
+
+info = {
+    "name": "buscar_google",
+    "description": "Un API de Búsqueda de Google. Útil cuando necesitas responder preguntas sobre\
+eventos actuales, personas o noticias. Utiliza esta herramienta especialmente cuando busques\
+información sobre eventos o personas. El resultado será un JSON { \n\
+    \"conseguidos\": [\n\
+        { \n\
+            \"titulo\": este contendrá el titulo del enlace , \n\
+            \"link\": este contendrá el enlace a la pagina donde está la información, puedes usar este enlace en \
+            la herramienta leer_pagina_web si está disponible para obtener más información, \n\
+            \"resumen\": este contendrá un resumen del contenido de la pagina \n\
+        },\n\
+        ...\n\
+    ]  \n\
+}",
+    "parameters": {
+        "type": "object",
+        "properties": {
+            "busqueda": {
+                "type": "string",
+                "description": "El termino a buscar en google para obtener información. e.g. Alejandro Magno",
+            },
+        },
+        "required": ["busqueda"],
+    }
+}
+
+def ejecutar(busqueda):
+    try:
+        service = build("customsearch", "v1", developerKey=api_key)
+        results = service.cse().list(q=busqueda, cx=cse_id).execute()
+        retorno = {}
+        retorno["conseguidos"] = []
+        for result in results["items"]:
+            retorno["conseguidos"].append({
+                "titulo": result["title"],
+                "link": result["link"],
+                "resumen": result["snippet"]
+            })
+        return json.dumps(retorno)
+    except Exception as e:
+        logger.error(repr(e))
+        return json.dumps({"status": "api failed"})
+    
+
+
+
+
+
+
+
+
+    
+
+
+def google_search(search_term, api_key, cse_id, **kwargs):
+    
+    
+    return res

chat_functions/leer_pagina_web.py

@@ -0,0 +1,48 @@
+import json
+import os
+import requests
+from logger import logger
+activo = False
+
+user_text = "Leyendo pagina web"
+
+info = {
+    "name": "leer_pagina_web",
+    "description": "Un portal hacia Internet. Úsalo cuando necesites obtener contenido específico de un sitio web. La entrada debe ser una URL (por ejemplo, https://www.google.com). La salida será la respuesta en texto de la solicitud GET.",
+    "parameters": {
+        "type": "object",
+        "properties": {
+            "url": {
+                "type": "string",
+                "description": "el url a consultar",
+            },
+        },
+        "required": ["url"],
+    }
+}
+
+def ejecutar(url):
+    try:
+        req = requests.get(url=url, timeout=5)
+        retorno = {
+            "data": req.text
+        }
+        return json.dumps(retorno)
+    except Exception as e:
+        logger.error(repr(e))
+        return json.dumps({"status": "api failed"})
+
+
+# def ejecutar(ubicacion, unidad="celsius"):
+#     url = f"https://api.weatherapi.com/v1/current.json?key={api_key}&q={ubicacion}&aqi=no"
+#     elementos = ["temp_c", "is_day", "condition", "wind_kph", "wind_dir", "precip_mm", "humidity", "cloud", "feelslike_c", "vis_km"]
+#     try:
+#         rq = requests.get(url, timeout=3)
+#         if rq.status_code!=200:
+#             return json.dumps({"status": "api failed"})
+#         clima = json.loads(rq.text)
+#         clima = {k: v for k, v in clima["current"].items() if k in elementos}
+#         return json.dumps(clima)
+#     except Exception as e:
+#         logger.error(repr(e))
+#         return json.dumps({"status": "api failed"})

chat_functions/obtener_clima.py

@@ -0,0 +1,46 @@
+import json
+import os
+import requests
+from logger import logger
+activo = True
+try:
+    api_key = os.getenv("WEATHERAPI_KEY")
+except:
+    api_key = False
+if not api_key:
+    activo = False
+
+user_text = "Consultando el clima"
+
+info = {
+    "name": "obtener_clima",
+    "description": "Obtiene el clima de una ubicación",
+    "parameters": {
+        "type": "object",
+        "properties": {
+            "ubicacion": {
+                "type": "string",
+                "description": "La ciudad, estado y pais, e.g. Caracas, Distrito Capital, Venezuela",
+            },
+            "unidad": {
+                "type": "string", 
+                "enum": ["celsius"]
+            },
+        },
+        "required": ["ubicacion", "unidad"],
+    }
+}
+
+def ejecutar(ubicacion, unidad="celsius"):
+    url = f"https://api.weatherapi.com/v1/current.json?key={api_key}&q={ubicacion}&aqi=no"
+    elementos = ["temp_c", "is_day", "condition", "wind_kph", "wind_dir", "precip_mm", "humidity", "cloud", "feelslike_c", "vis_km"]
+    try:
+        rq = requests.get(url, timeout=3)
+        if rq.status_code!=200:
+            return json.dumps({"status": "api failed"})
+        clima = json.loads(rq.text)
+        clima = {k: v for k, v in clima["current"].items() if k in elementos}
+        return json.dumps(clima)
+    except Exception as e:
+        logger.error(repr(e))
+        return json.dumps({"status": "api failed"})

error_map.py

@@ -1,26 +1,26 @@
-from openai import error as openai_error
-from fastapi import status
-import requests
-error_table = {
-    requests.exceptions.RequestException: {
-        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
-        "detail": "Los servidores tardaron mucho en responder, puede haber sobrecarga en OpenAI, reintenta luego (error 1)"
-    },
-    openai_error.APIConnectionError: {
-        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
-        "detail": "El servidor no respondió, hubo un error de API"
-    },
-    openai_error.Timeout: {
-        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
-        "detail": "El servidor tardó demasiado en responder"
-    },
-    openai_error.InvalidRequestError: {
-        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
-        "detail": "ChatGPT se gomitó 🤮, este chat ya es muy largo, limpia el chat y reintenta."
-    },
-    "undefined": {
-        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
-        "detail": "Error no definido 🙄"
-    }
-}
+from openai import error as openai_error
+from fastapi import status
+import requests
+error_table = {
+    requests.exceptions.RequestException: {
+        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
+        "detail": "Los servidores tardaron mucho en responder, puede haber sobrecarga en OpenAI, reintenta luego (error 1)"
+    },
+    openai_error.APIConnectionError: {
+        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
+        "detail": "El servidor no respondió, hubo un error de API"
+    },
+    openai_error.Timeout: {
+        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
+        "detail": "El servidor tardó demasiado en responder"
+    },
+    openai_error.InvalidRequestError: {
+        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
+        "detail": "ChatGPT se gomitó 🤮, este chat ya es muy largo, limpia el chat y reintenta."
+    },
+    "undefined": {
+        "status_code": status.HTTP_408_REQUEST_TIMEOUT,
+        "detail": "Error no definido 🙄"
+    }
+}
     

logger.py

@@ -0,0 +1,27 @@
+import logging
+
+_logger = logging.getLogger(__name__)
+_logger.setLevel(logging.DEBUG) 
+# Configura el archivo donde se guardarán los eventos
+file_handler = logging.FileHandler('logs/eventos.log')
+file_handler.setLevel(logging.DEBUG)
+
+stream_handler = logging.StreamHandler()
+stream_handler.setLevel(logging.DEBUG)
+
+# Define el formato de los mensajes de log
+formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(user)s - %(action)s - %(message)s')
+
+file_handler.setFormatter(formatter)
+stream_handler.setFormatter(formatter)
+
+# Agrega el handler al logger
+_logger.addHandler(file_handler)
+_logger.addHandler(stream_handler)
+
+
+logger = logging.LoggerAdapter(_logger, extra={'user': "system", 'action': ""})
+
+def log_write(user, action, data):
+    logger_l = logging.LoggerAdapter(_logger, extra={'user': user, 'action': action})
+    logger_l.info(data)

main.py

@@ -9,31 +9,32 @@ import jwt
 import openai
 from hashlib import sha256
 from error_map import error_table
+from logger import log_write, logger
+from oauthlib.oauth2 import WebApplicationClient
+GOOGLE_CLIENT_ID = os.environ.get("GOOGLE_CSE_ID", None)
+GOOGLE_CLIENT_SECRET = os.environ.get("GOOGLE_API_KEY", None)
+GOOGLE_DISCOVERY_URL = (
+    "https://accounts.google.com/.well-known/openid-configuration"
+)
+
+
+import chat_functions
+
+
 
-#from token_counter import count_tokens
 
 app = FastAPI()
 security = HTTPBasic()
 model = "gpt-3.5-turbo-16k"
 app.mount("/static", staticfiles.StaticFiles(directory="static"), name="static")
 users = json.loads(str(os.getenv("USER_KEYS")).replace("\n", ""))
+
+
 for key in users:
     if key == "master": continue
     password = key+users[key]+users["master"]
     users[key] = sha256(password.encode('UTF-8')).hexdigest()
 
-def write_line(line):
-    with open("log.txt", "a") as f:
-        f.write(line)
-        f.write("\n")
-
-def write_multi_line(list_text):
-    for line in list_text:
-        write_line(line)
-    write_line("---------------------------")
-
-
-write_multi_line(["inicio"])
 
 fecha_unix = str(int(time.time()))
 
@@ -41,6 +42,29 @@ JWT_SECRET = users["master"]
 JWT_ALGORITHM = "HS256"
 JWT_EXPIRATION_TIME_MINUTES = 30
 
+
+log_write("master", "iniciado", "-")
+
+### Login stuff
+
+def authenticate_user(credentials: HTTPBasicCredentials) -> bool:
+    username = credentials.username
+    password = credentials.password
+    password = username+password+users["master"]
+    password = sha256(password.encode('UTF-8')).hexdigest()
+
+    if credentials.username not in users or password != users[credentials.username]:
+        log_write(credentials.username, "Autenticacion usuario fallida", "")
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Incorrect username or password",
+            headers={"WWW-Authenticate": "Basic"},
+        )
+
+    log_write(credentials.username, "Usuario autenticado", "")
+    return True
+
+
 def create_jwt_token(data):
     to_encode = {"data": data}
     expire = datetime.utcnow() + timedelta(minutes=JWT_EXPIRATION_TIME_MINUTES)
@@ -56,131 +80,114 @@ async def validate_token(request: Request):
         payload = jwt.decode(token, JWT_SECRET, algorithms=[JWT_ALGORITHM])
         data["token_data"] = payload["data"]
     except Exception as e: 
-        raise HTTPException(status_code=404, detail="Datos no válidos")    
+        logger.error(repr(e) + " - " + str(data))
+        raise HTTPException(status_code=404, detail="Token inválido")    
     return data
 
-def authenticate_user(credentials: HTTPBasicCredentials):
 
-    password = credentials.username+credentials.password+users["master"]
-    password = sha256(password.encode('UTF-8')).hexdigest()
 
-    if credentials.username not in users or password != users[credentials.username]:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect username or password",
-            headers={"WWW-Authenticate": "Basic"},
-        )
-
-    return True
-
-    
-@app.get("/", response_class=HTMLResponse)
-async def root(request: Request, credentials: HTTPBasicCredentials = Depends(security)):
-    if authenticate_user(credentials):
-        token = create_jwt_token({"user":credentials.username})
-        with open(os.path.join("static", "main.html")) as f:
-            return HTMLResponse(f.read().replace("{% token %}", token).replace("{% version %}", fecha_unix))
-
-@app.post("/chat_sync")
-async def chat_sync(data = Depends(validate_token)):
-    messages = data.get("messages", "")
-    if not messages:
-        print("Empty message")
-        error = "What ??"
-        raise HTTPException(
-            status_code=status.HTTP_418_IM_A_TEAPOT,
-            detail= error
-        )
-    config = {
-        "temperature": float(data.get("config", []).get("temperature", 1)),
-        "frequency_penalty": float(data.get("config", []).get("frequency_penalty", 1)),
-        "presence_penalty": float(data.get("config", []).get("presence_penalty", 1))
-    }
+def ejecutar_llm(data):
+    messages = data["messages"]
     try:
-        t_s = time.time()
-        response_sync = openai.ChatCompletion.create(
+        config = {
+            "temperature": float(data.get("config", []).get("temperature", 1)),
+            "frequency_penalty": float(data.get("config", []).get("frequency_penalty", 1)),
+            "presence_penalty": float(data.get("config", []).get("presence_penalty", 1))
+        }
+        return openai.ChatCompletion.create(
             model=model,
             messages=messages,
             temperature=config["temperature"],
             frequency_penalty=config["frequency_penalty"],
             presence_penalty=config["presence_penalty"],
             request_timeout = 5,
-            stream=False
+            functions=chat_functions.functions,
+            function_call="auto",
+            stream=True
         )
-        print("time:", time.time() - t_s)
     except Exception as error:
+        logger.error(repr(error) + " - " + str(data))
         raise HTTPException(  **error_table.get(type(error), error_table["undefined"]))
+
+def manejar_funciones(chunk, response_async, data):
+    f_cb = dict(chunk["choices"][0]["delta"]["function_call"])
+    for chunk in response_async:
+        if chunk["choices"][0]["finish_reason"]: 
+            break   
+        for k, v in chunk["choices"][0]["delta"]["function_call"].items():
+            f_cb[k] += v
     
-    response = {"role":"", "content":""}
-    
-    response["role"] = response_sync["choices"][0]["delta"]["role"]
-    response["content"] = response_sync["choices"][0]["delta"]["content"]
-    token = create_jwt_token(data.pop("token_data"))
-    response["token"] = token
-    return JSONResponse(response)
+    f_cb["arguments"] = json.loads(f_cb["arguments"])
+    log_write(data["token_data"]["user"], "Funcion ejecutada RQ", json.dumps(f_cb))
+    resultado_funcion = chat_functions.function_callbacks[f_cb["name"]](**f_cb["arguments"])
+    log_write(data["token_data"]["user"], "Funcion ejecutada RS", json.dumps(resultado_funcion))
+    data["messages"].append({"role": "function",
+                "name": f_cb["name"],
+                "content": resultado_funcion,
+            })
+    return json.dumps(f_cb), ejecutar_llm(data)
+
+@app.get("/", response_class=HTMLResponse)
+async def root(request: Request, credentials: HTTPBasicCredentials = Depends(security)):
+    if authenticate_user(credentials):
+        token = create_jwt_token({"user":credentials.username})
+        with open(os.path.join("static", "main.html")) as f:
+            return HTMLResponse(f.read().replace("{% token %}", token).replace("{% version %}", fecha_unix))
+
+
 
 @app.post("/chat_async")
 async def chat_async(data = Depends(validate_token)):
     messages = data.get("messages", "")
-    print("recibido:", messages)
+    
+    
     if not messages:
         print("Empty message")
         error = "What ??"
+        log_write(data["token_data"]["user"], "Mensaje RQ", "error, mensajes vacios")
         raise HTTPException(
             status_code=status.HTTP_418_IM_A_TEAPOT,
             detail= error
         )
-    config = {
-        "temperature": float(data.get("config", []).get("temperature", 1)),
-        "frequency_penalty": float(data.get("config", []).get("frequency_penalty", 1)),
-        "presence_penalty": float(data.get("config", []).get("presence_penalty", 1))
-    }
-    try:
-        st = time.time()
-        response_async = openai.ChatCompletion.create(
-            model=model,
-            messages=messages,
-            temperature=config["temperature"],
-            frequency_penalty=config["frequency_penalty"],
-            presence_penalty=config["presence_penalty"],
-            request_timeout = 5,
-            stream=True
-        )
-        print("time:", time.time() - st)
-    except Exception as error:
-        raise HTTPException(  **error_table.get(type(error), error_table["undefined"]))
-    async def __streamer():
-        yield json.dumps({"comando": "token", "token":create_jwt_token(data.pop("token_data"))})
-        yield json.dumps({"comando": "status", "status":{"mensaje":"Cargando", "modo": "reemplazar"}})
+    log_write(data["token_data"]["user"], "Mensaje RQ", messages[-1]["content"])
+    response_async = ejecutar_llm(data)
+
+    async def __streamer(response_async, data):
 
+        # Verificar function_calls
         chunk = next(response_async)
-        mensaje = {"role": chunk["choices"][0]["delta"]["role"], "content":""}
+
+        yield json.dumps({"comando": "status", "status":{"mensaje":"Cargando", "modo": "reemplazar"}})
+
+        maximo_uso = 3
+        while chunk["choices"][0]["delta"].get("function_call") and maximo_uso:
+            nombre = chunk["choices"][0]["delta"]["function_call"]["name"]
+            yield json.dumps({"comando": "status", "status":{"mensaje": chat_functions.function_user_text[nombre] }})
+            mensaje_funcion, response_async = manejar_funciones(chunk, response_async, data)
+            yield json.dumps({"comando": "function", "function": {"role": "assistant", "content": mensaje_funcion} })
+            chunk = next(response_async)
+            maximo_uso -= 1
+
+        mensaje = {"role": "assistant", "content":""}
         
-        st = time.time()
-        st_times = 0
+
         for chunk in response_async:
             if chunk["choices"][0]["finish_reason"]:
                 break
-            
-            mensaje["content"] += chunk["choices"][0]["delta"]["content"]
-
-            if time.time() - st > 3:
-                if st_times > 2:
-                    yield json.dumps({"comando": "status", "status":{"mensaje":"Cargando", "modo": "reemplazar"}})
-                    st_times = 0
-                else:
-                    yield json.dumps({"comando": "status", "status":{"mensaje":".", "modo": "enlinea"}})
-                    st_times += 1
-                st = time.time()
+            if "content" in chunk["choices"][0]["delta"]:    
+                mensaje["content"] += chunk["choices"][0]["delta"]["content"]
                     
-
+        log_write(data["token_data"]["user"], "Mensaje Rs", mensaje["content"])
         yield json.dumps({"comando": "mensaje", "mensaje": mensaje})
-    return StreamingResponse(__streamer(), media_type="application/json")
+        yield json.dumps({"comando": "token", "token":create_jwt_token(data["token_data"])})
+    return StreamingResponse(__streamer(response_async, data), media_type="application/json")
 
 
 @app.get("/read_log", response_class=HTMLResponse)
 async def read_log(request: Request, credentials: HTTPBasicCredentials = Depends(security)):
-    if authenticate_user(credentials):
-        with open("log.txt", "r") as f:
+    if sha256(credentials.username.encode()).hexdigest()=="bc1c32d709aef061bbde4fc848421cdb933e8a9f391c3a089f2861ac0772c168" and authenticate_user(credentials):
+        log_write(credentials.username, "Log Accesado", "")
+        with open("logs/eventos.log", "r") as f:
             return HTMLResponse(f.read())
-
+    log_write(credentials.username, "Intento acceder logs", f"{request.client.host}:{request.client.port} - {str(dict(request.headers))}")
+    raise HTTPException(status_code=404)    

requirements.txt

@@ -1,7 +1,7 @@
-fastapi==0.74.*
-requests==2.27.*
-openai==0.27.*
-uvicorn[standard]==0.17.*
-PyJWT==2.6.0
-hypercorn>=0.14.3
-tiktoken>=0.3.0
+fastapi==0.103.*
+oauthlib==3.2.*
+requests==2.31.*
+openai==0.28.*
+uvicorn[standard]==0.23.*
+PyJWT==2.8.*
+hypercorn>=0.14.*

static/css/app.css

@@ -1,248 +1,251 @@
-html,
-body {
-    margin: 0;
-    padding: 0;
-    width: 100%;
-    height: 100svh;
-    font-family: Monospace;
-    font-size: 15px;
-}
-body {
-    display: flex;
-}
-button{
-    cursor: pointer;
-}
-.wrapper {
-    background: #34495e;
-    margin: 0;
-    min-width: 320px;
-    width: 100%;
-    display: grid;
-    grid-template-rows: 40px auto;
-    height: 100%;
-}
-.chat {
-    --textarea: 0px;
-    border-radius: 5px;
-    display: block;
-    width: 100%;
-    overflow-y: scroll;
-    overflow-x: hidden;
-    background: rgb(161, 161, 161);
-    padding: 10px 0;
-    height: max( calc( 100svh - 120px - var(--textarea) ), calc(50svh - 90px) );
-}
-
-.chat .message {
-    display: flex;
-    margin: 5px 20px 5px 10px;
-    filter: opacity(0.9);
-}
-.chat .message.me {
-    margin: 5px 10px 5px 20px;
-}
-.chat .message.comando {
-    margin: 5px auto;
-    display: table;
-}
-.chat .message:last-child {
-    filter: opacity(1);
-}
-
-.chat .message.no-opacity {
-    display: flex;
-    margin: 10px 0 0 10px;
-    filter: opacity(1);
-}
-
-.chat .message img {
-    margin: 0 10px 0 0;
-    height: 30px;
-    border-radius: 50%;
-}
-
-.chat .message.me img {
-    order: 2;
-    margin: 0 0 0 3px;
-}
-
-.chat .message div {
-    flex: 1;
-    max-width: 100%;
-}
-
-.chat .message div p {
-    max-width: calc( 100% - 20px );
-    display: inline-block;
-    margin: 0;
-    padding: 8px 10px 8px 10px;
-    background: #fff;
-    border-radius: 3px;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-    min-width: 40%;
-    transition: 0.5s height;
-}
-
-.chat .message.me div p {
-    float: right;
-    background: #b4c2ff;
-}
-.chat .message.comando div p {
-    background: #d0a8ff;
-}
-.chat .message.warning div p  {
-    background: #f0e370;
-}
-.chat .message.error div p  {
-    background: #f09470;
-}
-
-.chat .message div p ul {
-    list-style: none;
-    color: #555;
-    padding-right: 10px;
-}
-
-.chat .message:last-child div p ul {
-    list-style: none;
-    color: blue;
-}
-
-.chat .message div p ul.ultotal {
-    list-style: none;
-    color: #34495e;
-    font-size: 12px;
-}
-
-.chat .message pre {
-    overflow-x: scroll;
-    border: solid 1px #e5e4e4;
-    padding: 10px;
-}
-
-.input-box {
-    background: #222f3d;
-    margin: 10px 0;
-    height: 30px;
-    display: flex;
-    border-radius: 5px;
-    max-height: 50svh;
-}
-
-.input-box textarea,
-.input-box button {
-    height: 100%;
-    margin: 0;
-    border: none;
-    padding: 0 15px;
-}
-
-.input-box button:focus, .input-box textarea:focus  {
-    outline: none;
-}
-
-.input-box .input-text {
-    width: 100%;
-    border-radius: 5px 0 0 5px;
-    resize: none;
-    border-top: solid 7px #fff;
-    border-bottom: solid 7px #fff;
-    
-}
-.input-box button{
-    width: 30px;
-    background-size: 20px;
-    background-color: #ddd;
-    background-repeat: no-repeat;
-    background-position: center;
-    border-left: solid 1px #555;
-}
-.input-box .input-send {
-    background-image: url(/static/img/send.png);
-}
-.input-box .input-delete {
-    background-image: url(/static/img/delete.png);
-}
-.input-box button:first-child{
-    border-left: none;
-}
-.input-box button:last-child{
-    border-radius: 0 5px 5px 0;
-}
-.input-box button:disabled, .input-box textarea:disabled{
-    background-color: #8b8b8b;
-    border-color: #8b8b8b;
-
-}
-
-#message-template{
-    display: none;
-}
-
-.loader-wrap {
-    display: flex;
-}
-.loader {
-    margin: auto;
-    width: 48px;
-    height: 48px;
-    border: 3px dotted #476380;
-    border-style: solid solid dotted dotted;
-    border-radius: 50%;
-    display: inline-block;
-    position: relative;
-    box-sizing: border-box;
-    animation: rotation 2s linear infinite;
-}
-.loader.firststage{
-    border: 3px dotted #49b359;
-    border-style: solid solid dotted dotted;
-    transition:all 1s;
-}
-.loader::after {
-    content: '';  
-    box-sizing: border-box;
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    margin: auto;
-    border: 3px dotted #445464;
-    border-style: solid solid dotted;
-    width: 24px;
-    height: 24px;
-    border-radius: 50%;
-    animation: rotationBack 1s linear infinite;
-    transform-origin: center center;
-}
-.loader.firststage::after {
-    border: 3px dotted #49b359;
-    border-style: solid solid dotted;
-    transition:all 1s;
-}
-      
-@keyframes rotation {
-    0% {
-        transform: rotate(0deg);
-    }
-    100% {
-        transform: rotate(360deg);
-    }
-    } 
-    @keyframes rotationBack {
-    0% {
-        transform: rotate(0deg);
-    }
-    100% {
-        transform: rotate(-360deg);
-    }
-} 
-.loader-wrap  ~ div {
-    text-align: center;
-    margin-top: 10px;
-}
-dialog{
-    margin: auto;
-}
+html,
+body {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100svh;
+    font-family: Monospace;
+    font-size: 15px;
+}
+body {
+    display: flex;
+}
+button{
+    cursor: pointer;
+}
+.wrapper {
+    background: #34495e;
+    margin: 0;
+    min-width: 320px;
+    width: 100%;
+    display: grid;
+    grid-template-rows: 40px auto;
+    height: 100%;
+}
+.chat {
+    --textarea: 0px;
+    border-radius: 5px;
+    display: block;
+    width: 100%;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    background: rgb(161, 161, 161);
+    padding: 10px 0;
+    height: max( calc( 100svh - 120px - var(--textarea) ), calc(50svh - 90px) );
+}
+
+.chat .message {
+    display: flex;
+    margin: 5px 20px 5px 10px;
+    filter: opacity(0.9);
+}
+.chat .message.me {
+    margin: 5px 10px 5px 20px;
+}
+.chat .message.comando {
+    margin: 5px auto;
+    display: table;
+}
+.chat .message:last-child {
+    filter: opacity(1);
+}
+
+.chat .message.no-opacity {
+    display: flex;
+    margin: 10px 0 0 10px;
+    filter: opacity(1);
+}
+
+.chat .message img {
+    margin: 0 10px 0 0;
+    height: 30px;
+    border-radius: 50%;
+}
+
+.chat .message.me img {
+    order: 2;
+    margin: 0 0 0 3px;
+}
+
+.chat .message div {
+    flex: 1;
+    max-width: 100%;
+}
+
+.chat .message div p {
+    max-width: calc( 100% - 20px );
+    display: inline-block;
+    margin: 0;
+    padding: 8px 10px 8px 10px;
+    background: #fff;
+    border-radius: 3px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+    min-width: 40%;
+    transition: 0.5s height;
+}
+
+.chat .message.me div p {
+    float: right;
+    background: #b4c2ff;
+}
+.chat .message.comando div p {
+    background: #d0a8ff;
+}
+.chat .message.warning div p  {
+    background: #f0e370;
+}
+.chat .message.error div p  {
+    background: #f09470;
+}
+
+.chat .message div p ul {
+    list-style: none;
+    color: #555;
+    padding-right: 10px;
+}
+
+.chat .message:last-child div p ul {
+    list-style: none;
+    color: blue;
+}
+
+.chat .message div p ul.ultotal {
+    list-style: none;
+    color: #34495e;
+    font-size: 12px;
+}
+
+.chat .message pre {
+    overflow-x: scroll;
+    border: solid 1px #e5e4e4;
+    padding: 10px;
+}
+
+.input-box {
+    background: #222f3d;
+    margin: 10px 0;
+    height: 30px;
+    display: flex;
+    border-radius: 5px;
+    max-height: 50svh;
+}
+
+.input-box textarea,
+.input-box button {
+    height: 100%;
+    margin: 0;
+    border: none;
+    padding: 0 15px;
+}
+
+.input-box button:focus, .input-box textarea:focus  {
+    outline: none;
+}
+
+.input-box .input-text {
+    width: 100%;
+    border-radius: 5px 0 0 5px;
+    resize: none;
+    border-top: solid 7px #fff;
+    border-bottom: solid 7px #fff;
+    
+}
+.input-box button{
+    width: 30px;
+    background-size: 20px;
+    background-color: #ddd;
+    background-repeat: no-repeat;
+    background-position: center;
+    border-left: solid 1px #555;
+}
+.input-box .input-send {
+    background-image: url(/static/img/send.png);
+}
+.input-box .input-delete {
+    background-image: url(/static/img/delete.png);
+}
+.input-box .input-menu {
+    background-image: url(/static/img/menu.svg);
+}
+.input-box button:first-child{
+    border-left: none;
+}
+.input-box button:last-child{
+    border-radius: 0 5px 5px 0;
+}
+.input-box button:disabled, .input-box textarea:disabled{
+    background-color: #8b8b8b;
+    border-color: #8b8b8b;
+
+}
+
+#message-template{
+    display: none;
+}
+
+.loader-wrap {
+    display: flex;
+}
+.loader {
+    margin: auto;
+    width: 48px;
+    height: 48px;
+    border: 3px dotted #476380;
+    border-style: solid solid dotted dotted;
+    border-radius: 50%;
+    display: inline-block;
+    position: relative;
+    box-sizing: border-box;
+    animation: rotation 2s linear infinite;
+}
+.loader.firststage{
+    border: 3px dotted #49b359;
+    border-style: solid solid dotted dotted;
+    transition:all 1s;
+}
+.loader::after {
+    content: '';  
+    box-sizing: border-box;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    border: 3px dotted #445464;
+    border-style: solid solid dotted;
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    animation: rotationBack 1s linear infinite;
+    transform-origin: center center;
+}
+.loader.firststage::after {
+    border: 3px dotted #49b359;
+    border-style: solid solid dotted;
+    transition:all 1s;
+}
+      
+@keyframes rotation {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+    } 
+    @keyframes rotationBack {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(-360deg);
+    }
+} 
+.loader-wrap  ~ div {
+    text-align: center;
+    margin-top: 10px;
+}
+dialog{
+    margin: auto;
+}

static/css/tabs.css

@@ -36,6 +36,7 @@
     margin-right: 4px;
     border-radius: 0px 0px 10px 10px;
     transition: 0.2s background-color;
+    background: #7d9dbd;
 }
 .tab-label-add {
     background: #3b74ad;

static/js/chatHandler.js

@@ -2,6 +2,7 @@ class ChatGPT{
     definicion = "Te llamas Chatsito, eres un asistente de apoyo a los amigos de MIA, " +
     "tu objetivo principal es responder preguntas de manera puntual y objetiva " +
     "a tu interlocutor.\n" +
+    "Si requieres ejecutar más funciones, ejecuta tantas veces como lo necesites" +
     "Responde de manera amistosa con en el texto más corto y objetivo posible.\n" +
     "Knowledge cutoff: 2021-09-01\nCurrent date: {date}"; 
     constructor(token){
@@ -144,6 +145,10 @@ class ChatGPT{
                             localStorage.setItem("conversaciones", JSON.stringify(self.conversaciones))
                             ctx.trigger("precarga:mensaje", response.mensaje.content);
                             break;
+                        case "function":
+                            conversacion.push(response.function);
+                            localStorage.setItem("conversaciones", JSON.stringify(self.conversaciones))
+                            break;
                         default:
                             console.log("???")
                     }

static/main.html

@@ -40,6 +40,7 @@
             <div class='input-box'>
                 <textarea class='input-text' placeholder="Escribe aquí" type="text" autofocus=""></textarea>
                 <button class='input-send' ></button>
+                <button class='input-menu' ></button>
                 <button class='input-delete' ></button>
             </div>
         </div>

token_counter.py

@@ -0,0 +1,17 @@
+import tiktoken
+def count_tokens(messages, model="gpt-3.5-turbo-16k"):
+    """Returns the number of tokens used by a list of messages."""
+    try:
+        encoding = tiktoken.encoding_for_model(model)
+    except KeyError:
+        encoding = tiktoken.get_encoding("cl100k_base")
+
+    num_tokens = 0
+    for message in messages:
+        num_tokens += 4  # every message follows <im_start>{role/name}\n{content}<im_end>\n
+        for key, value in message.items():
+            num_tokens += len(encoding.encode(value))
+            if key == "name":  # if there's a name, the role is omitted
+                num_tokens += -1  # role is always required and always 1 token
+    num_tokens += 2  # every reply is primed with <im_start>assistant
+    return num_tokens