npcpy 1.3.11__py3-none-any.whl → 1.3.12__py3-none-any.whl

npcpy/serve.py

@@ -572,7 +572,7 @@ def fetch_messages_for_conversation(conversation_id):
     try:
         with engine.connect() as conn:
             query = text("""
-                SELECT role, content, timestamp
+                SELECT role, content, timestamp, tool_calls, tool_results
                 FROM conversation_history
                 WHERE conversation_id = :conversation_id
                 ORDER BY timestamp ASC
@@ -580,14 +580,45 @@ def fetch_messages_for_conversation(conversation_id):
             result = conn.execute(query, {"conversation_id": conversation_id})
             messages = result.fetchall()
 
-            return [
-                {
-                    "role": message[0],  
-                    "content": message[1],  
-                    "timestamp": message[2],  
+            parsed_messages = []
+            for message in messages:
+                role = message[0]
+                content = message[1]
+
+                msg_dict = {
+                    "role": role,
+                    "content": content,
+                    "timestamp": message[2],
                 }
-                for message in messages
-            ]
+
+                # Handle tool messages - extract tool_call_id from content JSON
+                if role == "tool" and content:
+                    try:
+                        content_parsed = json.loads(content) if isinstance(content, str) else content
+                        if isinstance(content_parsed, dict):
+                            if "tool_call_id" in content_parsed:
+                                msg_dict["tool_call_id"] = content_parsed["tool_call_id"]
+                            if "tool_name" in content_parsed:
+                                msg_dict["name"] = content_parsed["tool_name"]
+                            if "content" in content_parsed:
+                                msg_dict["content"] = content_parsed["content"]
+                    except (json.JSONDecodeError, TypeError):
+                        pass
+
+                # Parse tool_calls JSON if present (for assistant messages)
+                if message[3]:
+                    try:
+                        msg_dict["tool_calls"] = json.loads(message[3]) if isinstance(message[3], str) else message[3]
+                    except (json.JSONDecodeError, TypeError):
+                        pass
+                # Parse tool_results JSON if present
+                if message[4]:
+                    try:
+                        msg_dict["tool_results"] = json.loads(message[4]) if isinstance(message[4], str) else message[4]
+                    except (json.JSONDecodeError, TypeError):
+                        pass
+                parsed_messages.append(msg_dict)
+            return parsed_messages
     except Exception as e:
         print(f"Error fetching messages for conversation: {e}")
         return []
@@ -3935,7 +3966,7 @@ def stream():
                                     input_values=tool_args if isinstance(tool_args, dict) else {},
                                     npc=npc_object
                                 )
-                                tool_content = str(jinx_ctx)
+                                tool_content = str(jinx_ctx.get('output', '')) if isinstance(jinx_ctx, dict) else str(jinx_ctx)
                             except Exception as e:
                                 tool_content = f"Jinx execution error: {str(e)}"
                         else:

{npcpy-1.3.11.dist-info → npcpy-1.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcpy
-Version: 1.3.11
+Version: 1.3.12
 Summary: npcpy is the premier open-source library for integrating LLMs and Agents into python systems.
 Home-page: https://github.com/NPC-Worldwide/npcpy
 Author: Christopher Agostino

{npcpy-1.3.11.dist-info → npcpy-1.3.12.dist-info}/RECORD

@@ -7,7 +7,7 @@ npcpy/npc_array.py,sha256=fVTxcMiXV-lvltmuwaRnTU9D3ikPq3-7k5wzp7MA5OY,40224
 npcpy/npc_compiler.py,sha256=9U6_F7qweURaL2nQgrF7I9OQEmYjOENmkBV-YChr3oM,118402
 npcpy/npc_sysenv.py,sha256=VH7le3xwxHvO55ZYCG1e-gj8X5YTSIqbIiU6ifSqhss,38917
 npcpy/npcs.py,sha256=eExuVsbTfrRobTRRptRpDm46jCLWUgbvy4_U7IUQo-c,744
-npcpy/serve.py,sha256=VjRwD4cDXgawD6L6yVl-8-oUWyYrfIgaKAhu9c0NjDI,229714
+npcpy/serve.py,sha256=0jV4O-6j7efFDk1T_rrx-ZUom1c-dh0zNANlYMMKDYI,231461
 npcpy/tools.py,sha256=A5_oVmZkzGnI3BI-NmneuxeXQq-r29PbpAZP4nV4jrc,5303
 npcpy/data/__init__.py,sha256=1tcoChR-Hjn905JDLqaW9ElRmcISCTJdE7BGXPlym2Q,642
 npcpy/data/audio.py,sha256=o4auV8DQrAmZ4y84U3SofiwEuq5-ZBjGEZipQ9zPpGQ,22816
@@ -53,8 +53,8 @@ npcpy/work/browser.py,sha256=p2PeaoZdAXipFuAgKCCB3aXXLE_p3yIRqC87KlZKZWc,679
 npcpy/work/desktop.py,sha256=F3I8mUtJp6LAkXodsh8hGZIncoads6c_2Utty-0EdDA,2986
 npcpy/work/plan.py,sha256=QyUwg8vElWiHuoS-xK4jXTxxHvkMD3VkaCEsCmrEPQk,8300
 npcpy/work/trigger.py,sha256=P1Y8u1wQRsS2WACims_2IdkBEar-iBQix-2TDWoW0OM,9948
-npcpy-1.3.11.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
-npcpy-1.3.11.dist-info/METADATA,sha256=jRdfngd30yMIL7slCyAgYQkz_Vx32Bn1fxDv45X-lP8,37885
-npcpy-1.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcpy-1.3.11.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
-npcpy-1.3.11.dist-info/RECORD,,
+npcpy-1.3.12.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
+npcpy-1.3.12.dist-info/METADATA,sha256=PowYAWEVkhhzpbRWFKJcntLCy8zseMTIccfLlTb7Cw0,37885
+npcpy-1.3.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+npcpy-1.3.12.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
+npcpy-1.3.12.dist-info/RECORD,,