sunholo 0.56.1__py3-none-any.whl → 0.56.3__py3-none-any.whl

sunholo/agents/fastapi/qna_routes.py

@@ -22,7 +22,6 @@ class VACRequest(BaseModel):
     chat_history: Optional[list] = None
     stream_wait_time: Optional[int] = 7
     stream_timeout: Optional[int] = 120
-    message_author: Optional[str] = None
     image_url: Optional[str] = None
 
 
@@ -43,8 +42,7 @@ def create_stream_qa_endpoint(stream_interpreter):
                                                             qna_func=stream_interpreter,
                                                             chat_history=paired_messages,
                                                             wait_time=request.stream_wait_time,
-                                                            timeout=request.stream_timeout,
-                                                            message_author=request.message_author):
+                                                            timeout=request.stream_timeout):
                 if isinstance(chunk, dict) and 'answer' in chunk:
                     archive_qa(chunk, vector_name)
                     yield f"###JSON_START###{json.dumps(chunk)}###JSON_END###"
@@ -68,9 +66,9 @@ def create_process_qna_endpoint(qna_interpreter):
         try:
 
             if asyncio.iscoroutinefunction(qna_interpreter):
-                bot_output = await qna_interpreter(user_input, vector_name, chat_history=paired_messages, message_author=request.message_author)
+                bot_output = await qna_interpreter(user_input, vector_name, chat_history=paired_messages)
             else:
-                bot_output = qna_interpreter(user_input, vector_name, chat_history=paired_messages, message_author=request.message_author)
+                bot_output = qna_interpreter(user_input, vector_name, chat_history=paired_messages)
 
             bot_output = parse_output(bot_output)
             archive_qa(bot_output, vector_name)

sunholo/qna/retry.py

@@ -33,7 +33,7 @@ def retry_qna(qa_function, question, max_retries=1, initial_delay=5):
             except ReadTimeout:
                 if retry == max_retries - 1:
                     raise
-        except Exception as err:
+        except Exception:
             delay = initial_delay * (retry + 1)
             log.error(f"General error: {traceback.format_exc()}")
             time.sleep(delay)

sunholo/streaming/streaming.py

@@ -23,6 +23,7 @@ from ..qna.parsers import parse_output
 
 from ..logging import log
 from ..utils import load_config_key
+from ..utils.parsers import check_kwargs_support
 
 from .langserve import parse_langserve_token, parse_langserve_token_async
 
@@ -34,6 +35,9 @@ def start_streaming_chat(question,
                          wait_time=2,
                          timeout=120, # Timeout in seconds (2 minutes)
                          **kwargs): 
+    
+    if not check_kwargs_support(qna_func):
+        yield "No **kwargs in qna_func - please add it"
 
     # Immediately yield to indicate the process has started.
     yield "Thinking...\n"
@@ -47,9 +51,12 @@ def start_streaming_chat(question,
     stop_event = Event()
 
     def start_chat(stop_event, result_queue, exception_queue):
-        # autogen_qna(user_input, vector_name, chat_history=None, message_author=None):
+        # autogen_qna(user_input, vector_name, chat_history=None):
         try:
-            final_result = qna_func(question, vector_name, chat_history, callback=chat_callback_handler, **kwargs)
+            final_result = qna_func(question=question, 
+                                    vector_name=vector_name, 
+                                    chat_history=chat_history, 
+                                    callback=chat_callback_handler, **kwargs)
             result_queue.put(final_result)
         except Exception as e:
             exception_queue.put(e)

sunholo/utils/config.py

@@ -105,7 +105,9 @@ def load_all_configs():
     from ..logging import log
 
     config_folder = os.getenv("_CONFIG_FOLDER", os.getcwd())
-    log.debug(f"Loading all configs from folder: {config_folder}")
+    config_file = os.path.join(config_folder, "config")
+    
+    log.info(f"Loading all configs from folder: {config_folder}")
     current_time = datetime.now()
 
     configs_by_kind = defaultdict(dict)
@@ -117,7 +119,7 @@ def load_all_configs():
             if filename in config_cache:
                 cached_config, cache_time = config_cache[filename]
                 if (current_time - cache_time) < timedelta(minutes=5):
-                    log.debug(f"Returning cached config for {filename}")
+                    log.info(f"Returning cached config for {filename}")
                     config = cached_config
                 else:
                     config = reload_config_file(config_file, filename)
@@ -234,6 +236,8 @@ def load_config_key(key: str, vector_name: str, filename: str=None, kind: str=No
     assert isinstance(vector_name, str), f"vector_name must be a string, got a {type(vector_name)}"
     
     configs_by_kind = load_all_configs()
+    log.info(f"configs by kind: {configs_by_kind}")
+             
     if kind and configs_by_kind.get(kind):
         config = configs_by_kind[kind]
         filename = kind

sunholo/utils/parsers.py

@@ -118,4 +118,22 @@ def remove_whitespace(page_content: str):
     print(cleaned_text)  # Outputs 'Hello, world! This is an example.'
     ```
     """
-    return page_content.replace("\n", " ").replace("\r", " ").replace("\t", " ").replace("  ", " ")
+    return page_content.replace("\n", " ").replace("\r", " ").replace("\t", " ").replace("  ", " ")
+
+def check_kwargs_support(func):
+    """
+    Check if the function 'func' accepts arbitrary keyword arguments (**kwargs).
+
+    Args:
+    func (callable): The function to check.
+
+    Returns:
+    bool: True if **kwargs is accepted, False otherwise.
+    """
+    import inspect
+    
+    sig = inspect.signature(func)
+    for param in sig.parameters.values():
+        if param.kind == param.VAR_KEYWORD:
+            return True
+    return False

{sunholo-0.56.1.dist-info → sunholo-0.56.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.56.1
+Version: 0.56.3
 Summary: Large Language Model DevOps - a package to help deploy LLMs to the Cloud.
 Home-page: https://github.com/sunholo-data/sunholo-py
-Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.56.1.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.56.3.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.56.1.dist-info → sunholo-0.56.3.dist-info}/RECORD

@@ -10,7 +10,7 @@ sunholo/agents/special_commands.py,sha256=Q8QM0SKZd8XLny5Jxj8fS72emBdNIe9wo1RCk_
 sunholo/agents/test_chat_history.py,sha256=vPbPu0xREEs4J4X_zJKBY1f19Vy5yV05_CKfUUQqfFg,3923
 sunholo/agents/fastapi/__init__.py,sha256=S_pj4_bTUmDGoq_exaREHlOKThi0zTuGT0VZY0YfODQ,88
 sunholo/agents/fastapi/base.py,sha256=clk76cHbUAvU0OYJrRfCWX_5f0ACbhDsIzYBhI3wyoE,2514
-sunholo/agents/fastapi/qna_routes.py,sha256=Xl05L8DjUozGMK7kKPqz7Twr4W56BnLQu_uprsTv_q0,4075
+sunholo/agents/fastapi/qna_routes.py,sha256=DgK4Btu5XriOC1JaRQ4G_nWEjJfnQ0J5pyLanF6eF1g,3857
 sunholo/agents/flask/__init__.py,sha256=uqfHNw2Ru3EJ4dJEcbp86h_lkquBQPMxZbjhV_xe3rs,72
 sunholo/agents/flask/base.py,sha256=RUGWBYWeV60FatYF5sMRrxD-INU97Vodsi6JaB6i93s,763
 sunholo/agents/flask/qna_routes.py,sha256=hjUwW3-HEpE0RE2OxtnFJc_CAuzRexJxFSRXEAnFUVo,8426
@@ -72,20 +72,20 @@ sunholo/pubsub/process_pubsub.py,sha256=64hvqMsxbBrf0WGJsprz_SXf9FpjeszAIsqUSBlJ
 sunholo/pubsub/pubsub_manager.py,sha256=M85QPCXYBPzmE8Ha0FYHdzpA-LRX9p3lu6b-UAHAyac,6400
 sunholo/qna/__init__.py,sha256=F8q1uR_HreoSX0IfmKY1qoSwIgXhO2Q8kuDSxh9_-EE,28
 sunholo/qna/parsers.py,sha256=Qn7lYsO2daWN0kDRGop5CkamIPq9wWFPEB1cP6Is7Ng,1585
-sunholo/qna/retry.py,sha256=hAcqCZchAG1610G6huPev4ymDdO2G5tT3mrK28dxlAs,2028
+sunholo/qna/retry.py,sha256=gFgOf9AxrZMIO9OwOYu1EW7rhNhyfnw_o4XAsNLBOVQ,2021
 sunholo/streaming/__init__.py,sha256=k8dBqhzyS1Oi6NfADtRtWfnPtU1FU2kQz-YxH9yrNeQ,197
 sunholo/streaming/content_buffer.py,sha256=hr2ySHOTK1zw_3u-JrKwoomsAAdda2VcOxjkvJLcUuM,6596
 sunholo/streaming/langserve.py,sha256=6isOvFwZBfmiQY5N41PYPyrdJj9IgJXXHLfTzPvewGw,6299
-sunholo/streaming/streaming.py,sha256=0Bgl_FYmd2GJuy_4khDx5y_nfPqDp7Yu8ZkQ9POVhGk,16446
+sunholo/streaming/streaming.py,sha256=TLLBamDs5ihvA77I30xAXu_J8vMVUmhyeJFJkTN9ess,16723
 sunholo/summarise/__init__.py,sha256=MZk3dblUMODcPb1crq4v-Z508NrFIpkSWNf9FIO8BcU,38
 sunholo/summarise/summarise.py,sha256=C3HhjepTjUhUC8FLk4jMQIBvq1BcORniwuTFHjPVhVo,3784
 sunholo/utils/__init__.py,sha256=MxuxoJ-oOie_skGnB4mOagVYjzvfmX9Gz9N5heI8azM,62
-sunholo/utils/config.py,sha256=qkcK1T2AvobmkTp8D-SNXLBxe86TKCuquA_5TkrVfk8,9589
+sunholo/utils/config.py,sha256=KD3mcLg7GadpT884mtORC7fP9XbDy-gHetUSuV-VonQ,9714
 sunholo/utils/gcp.py,sha256=B2G1YKjeD7X9dqO86Jrp2vPuFwZ223Xl5Tg09Ndw-oc,5760
-sunholo/utils/parsers.py,sha256=E-M7s3_rPviT5zCqQHzhb1DwYmz5a1J472ZVazx10M8,3400
-sunholo-0.56.1.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.56.1.dist-info/METADATA,sha256=2uvcoErVkLNHebBWGCkxsR20evWPXStpQwxOdiIHCt4,6515
-sunholo-0.56.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-sunholo-0.56.1.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.56.1.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.56.1.dist-info/RECORD,,
+sunholo/utils/parsers.py,sha256=OrHmASqIbI45atVOhiGodgLvnfrzkvVzyHnSvAXD89I,3841
+sunholo-0.56.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.56.3.dist-info/METADATA,sha256=YMpQxhWTwBnpy2saOxsZ9sArk4rliKvS6s5dQAyLs0Q,6515
+sunholo-0.56.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+sunholo-0.56.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.56.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.56.3.dist-info/RECORD,,