sunholo 0.99.3__py3-none-any.whl → 0.99.5__py3-none-any.whl

sunholo/genai/process_funcs_cls.py

@@ -449,39 +449,38 @@ class GenAIFunctionProcessor:
                         token = token_queue.popleft()
                         callback.on_llm_new_token(token=token)
 
-                    try:
-                        log.info(f"{fn_log} created a result={type(fn_result)=}")
-                        # Convert MapComposite to a standard Python dictionary
-                        if isinstance(fn_result, proto.marshal.collections.maps.MapComposite):
-                            fn_result = dict(fn_result)
-                            if isinstance(fn_result, str):
-                                fn_result_json = json.loads(fn_result)
-                            else:
-                                fn_result_json = fn_result
-                        elif isinstance(fn_result, dict):
-                            fn_result_json = fn_result
-                        else:
-                            log.warning(f"Unrecognised result: {type(fn_result)}")
-                        if not isinstance(fn_result_json, dict):
-                            log.warning(f"{fn_result} was loaded but is not a dictionary")
-                            fn_result_json = None
-                    except json.JSONDecodeError:
-                        log.warning(f"{fn_result} was not JSON decoded")
-                        fn_result_json = None
-                    except Exception as err:
-                        log.warning(f"{fn_result} was not json decoded due to unknown exception: {str(err)} {traceback.format_exc()}")
-                        fn_result_json = None
-
+                    log.info(f"{fn_log} created a result={type(fn_result)=}")
+                    
+                    fn_result_json = None
+                    # Convert MapComposite to a standard Python dictionary
+                    if isinstance(fn_result, proto.marshal.collections.maps.MapComposite):
+                        fn_result_json = dict(fn_result)
+                    elif isinstance(fn_result, dict):
+                        fn_result_json = fn_result
+                    elif isinstance(fn_result, str):
+                        try:
+                            if isinstance(fn_result_json, str):
+                                fn_result_json = json.loads(fn_result_json)
+                        except json.JSONDecodeError:
+                            log.warning(f"{fn_result} was not JSON decoded")
+                        except Exception as err:
+                            log.warning(f"{fn_result} was not json decoded due to unknown exception: {str(err)} {traceback.format_exc()}")
+                    else:
+                        log.warning(f"Unrecognised type for {fn_log}: {type(fn_result)}")
+                    
+                    # should be a string or a dict by now
+                    log.info(f"Processed {fn_log} to {fn_result_json=} type: {type(fn_result_json)}")
+                    
                     if fn == "decide_to_go_on":
-                        log.info(f"{fn_result=} {type(fn_result)}")
-                        go_on_args = fn_result
-                        if go_on_args:
-                            token = f"\n{'STOPPING' if not go_on_args.get('go_on') else 'CONTINUE'}: {go_on_args.get('chat_summary')}\n"
+                        log.info(f"{fn_result_json=} {type(fn_result)}")
+                        if fn_result_json:
+                            token = f"\n{'STOPPING' if not fn_result_json.get('go_on') else 'CONTINUE'}: {fn_result_json.get('chat_summary')}\n"
                         else:
                             log.warning(f"{fn_result_json} did not work for decide_to_go_on")
-                            token = f"Error calling decide_to_go_on with {fn_result}\n"
+                            token = f"Error calling decide_to_go_on with {fn_result=}\n"
                     else:
                         token = f"--- {fn_log} result --- \n"
+                        # if json dict we look for keys to extract
                         if fn_result_json:
                             if fn_result_json.get('stdout'):
                                 text = fn_result_json.get('stdout').encode('utf-8').decode('unicode_escape')
@@ -490,8 +489,10 @@ class GenAIFunctionProcessor:
                                 text = fn_result_json.get('stdout').encode('utf-8').decode('unicode_escape')
                                 token += text
                             if not fn_result_json.get('stdout') and fn_result_json.get('stderr'):
-                                token += f"{fn_result}\n"
+                                log.info(f"No recognised keys in dict: {fn_result_json=} - dumping it all")
+                                token += f"{json.dumps(fn_result_json)}\n"
                         else:
+                            # probably a string, just return it
                             token += f"{fn_result}\n--- end ---\n"
                     
                     this_text += token

{sunholo-0.99.3.dist-info → sunholo-0.99.5.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: sunholo
-Version: 0.99.3
+Version: 0.99.5
 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.99.3.tar.gz
+Download-URL: https://github.com/sunholo-data/sunholo-py/archive/refs/tags/v0.99.5.tar.gz
 Author: Holosun ApS
 Author-email: multivac@sunholo.com
 License: Apache License, Version 2.0

{sunholo-0.99.3.dist-info → sunholo-0.99.5.dist-info}/RECORD

@@ -86,7 +86,7 @@ sunholo/gcs/download_url.py,sha256=q1NiJSvEhdNrmU5ZJ-sBCMC_J5CxzrajY8LRgdPOV_M,6
 sunholo/gcs/metadata.py,sha256=oQLcXi4brsZ74aegWyC1JZmhlaEV270HS5_UWtAYYWE,898
 sunholo/genai/__init__.py,sha256=dBl6IA3-Fx6-Vx81r0XqxHlUq6WeW1iDX188dpChu8s,115
 sunholo/genai/init.py,sha256=yG8E67TduFCTQPELo83OJuWfjwTnGZsyACospahyEaY,687
-sunholo/genai/process_funcs_cls.py,sha256=CJCYA5fHAjYaF2uu-H9HzCPEhvGLlRITU2AHZcPz20k,24821
+sunholo/genai/process_funcs_cls.py,sha256=feWvtWdCYYwAcEA2ZuCDY8pmLOqhoCVjkEVczZyrPDY,24988
 sunholo/genai/safety.py,sha256=mkFDO_BeEgiKjQd9o2I4UxB6XI7a9U-oOFjZ8LGRUC4,1238
 sunholo/invoke/__init__.py,sha256=o1RhwBGOtVK0MIdD55fAIMCkJsxTksi8GD5uoqVKI-8,184
 sunholo/invoke/async_class.py,sha256=uvCP8ekUCfTRWk7xwofTzRqFykMAwrRZ4Ce_YUR6PVs,2820
@@ -144,9 +144,9 @@ sunholo/vertex/init.py,sha256=1OQwcPBKZYBTDPdyU7IM4X4OmiXLdsNV30C-fee2scQ,2875
 sunholo/vertex/memory_tools.py,sha256=tBZxqVZ4InTmdBvLlOYwoSEWu4-kGquc-gxDwZCC4FA,7667
 sunholo/vertex/safety.py,sha256=S9PgQT1O_BQAkcqauWncRJaydiP8Q_Jzmu9gxYfy1VA,2482
 sunholo/vertex/type_dict_to_json.py,sha256=uTzL4o9tJRao4u-gJOFcACgWGkBOtqACmb6ihvCErL8,4694
-sunholo-0.99.3.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
-sunholo-0.99.3.dist-info/METADATA,sha256=ZbYM2dfChl6nLGkN5OB5SbYiS7CSEyLoKkdTJKteFss,8310
-sunholo-0.99.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-sunholo-0.99.3.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
-sunholo-0.99.3.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
-sunholo-0.99.3.dist-info/RECORD,,
+sunholo-0.99.5.dist-info/LICENSE.txt,sha256=SdE3QjnD3GEmqqg9EX3TM9f7WmtOzqS1KJve8rhbYmU,11345
+sunholo-0.99.5.dist-info/METADATA,sha256=mPbrSQh6sLIRXolYX-xbtkuTVBFgqXAvTymdek-Fk5M,8310
+sunholo-0.99.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+sunholo-0.99.5.dist-info/entry_points.txt,sha256=bZuN5AIHingMPt4Ro1b_T-FnQvZ3teBes-3OyO0asl4,49
+sunholo-0.99.5.dist-info/top_level.txt,sha256=wt5tadn5--5JrZsjJz2LceoUvcrIvxjHJe-RxuudxAk,8
+sunholo-0.99.5.dist-info/RECORD,,