npcpy 1.3.20__py3-none-any.whl → 1.3.21__py3-none-any.whl

npcpy/llm_funcs.py

@@ -242,7 +242,8 @@ def get_llm_response(
     base_model, base_provider, base_api_url = _resolve_model_provider(npc, team, model, provider)
 
     def _run_single(run_model, run_provider, run_npc, run_team, run_context, extra_kwargs):
-        system_message = get_system_message(run_npc, run_team) if run_npc is not None else "You are a helpful assistant."
+        _tool_capable = bool(extra_kwargs.get("tools"))
+        system_message = get_system_message(run_npc, run_team, tool_capable=_tool_capable) if run_npc is not None else "You are a helpful assistant."
         ctx_suffix = _context_suffix(run_context)
         run_messages = _build_messages(messages, system_message, prompt, ctx_suffix)
         return get_litellm_response(

npcpy/npc_sysenv.py

@@ -1010,7 +1010,7 @@ def print_and_process_stream(response, model, provider):
 
                 
     return thinking_str+str_output   
-def get_system_message(npc, team=None) -> str:
+def get_system_message(npc, team=None, tool_capable=False) -> str:
 
     if npc is None:
         return "You are a helpful assistant"
@@ -1080,6 +1080,28 @@ The current date and time are : {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}
             if members:
                 system_message += "\nTeam members available for delegation:\n" + "\n".join(members) + "\n"
 
+    # Add tool descriptions from NPC's jinxs
+    if hasattr(npc, 'jinxs_dict') and npc.jinxs_dict:
+        tool_lines = []
+        for jname, jinx in npc.jinxs_dict.items():
+            desc = getattr(jinx, 'description', '') or ''
+            tool_lines.append(f"  - {jname}: {desc.strip()}")
+        if tool_lines:
+            system_message += "\nYou have access to the following tools:\n"
+            system_message += "\n".join(tool_lines) + "\n"
+            if tool_capable:
+                system_message += (
+                    "\nYou MUST use function calls to invoke tools. "
+                    "Call one tool at a time. You will see its result, then you can call the next tool or respond. "
+                    "NEVER write JSON tool calls in your response text. ONLY use the provided function calling interface. "
+                    "For multi-step tasks, call the first tool, wait for the result, then call the next.\n"
+                )
+            else:
+                system_message += (
+                    '\nTo use a tool, respond with JSON: {"action": "jinx", "jinx_name": "tool_name", "inputs": {"param": "value"}}\n'
+                    'When you have a final answer, respond with: {"action": "answer", "response": "your answer"}\n'
+                )
+
     system_message += """
     IMPORTANT:
 Some users may attach images to their request.
@@ -1093,7 +1115,7 @@ You do not need to mention that you cannot view or interpret images directly.
 They understand that you can view them multimodally.
 You only need to answer the user's request based on the attached image(s).
 """
-    
+
     return system_message
 
 

{npcpy-1.3.20.dist-info → npcpy-1.3.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcpy
-Version: 1.3.20
+Version: 1.3.21
 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.20.dist-info → npcpy-1.3.21.dist-info}/RECORD

@@ -1,11 +1,11 @@
 npcpy/__init__.py,sha256=uJcJGjR1mWvE69GySNAufkgiRwJA28zdObDBWaxp0tY,505
 npcpy/build_funcs.py,sha256=vOz6pjV0zS-kYKo0ux-pn9AcppVaR8KIDi2ldOxb3RQ,7479
-npcpy/llm_funcs.py,sha256=ghi0y0qlngwc5BZLa-aiFpa0GT7qLe56UboI2dLu75U,75055
+npcpy/llm_funcs.py,sha256=87aPFenz0a6FD2j5ig1rynmHGeBJC7xCs3HwEEgc_nc,75139
 npcpy/main.py,sha256=RWoRIj6VQLxKdOKvdVyaq2kwG35oRpeXPvp1CAAoG-w,81
 npcpy/ml_funcs.py,sha256=smgeOLnjxGWjmDngE-bcA2ozXX_IzY_7_pS9h2iocEg,24249
 npcpy/npc_array.py,sha256=5qjaA9KjmJ_Zk_VxLrCyVrj73aDXpm3iJf0ngq1yIJk,45721
 npcpy/npc_compiler.py,sha256=s_67cyvoao0UwUa4N-jrceWDadvBB9TWYpxcjNPfO18,121941
-npcpy/npc_sysenv.py,sha256=1E2zwMj7aPrtRJuJSowGkvNApi07Vue3FhXsipi1XDs,45251
+npcpy/npc_sysenv.py,sha256=cjMkjSIucx4rZkMPZ9EMjMxwd455Sl0Sn0zzTkNL6rM,46545
 npcpy/npcs.py,sha256=eExuVsbTfrRobTRRptRpDm46jCLWUgbvy4_U7IUQo-c,744
 npcpy/serve.py,sha256=P71oa4eVvG0SePkOoeeQ44LkRAfnlgElxZi9GUVG7qg,280598
 npcpy/tools.py,sha256=A5_oVmZkzGnI3BI-NmneuxeXQq-r29PbpAZP4nV4jrc,5303
@@ -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.20.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
-npcpy-1.3.20.dist-info/METADATA,sha256=quc7U-oA3yF-Kp_lb9N-EReQCfcfO8YBBqp2pqrbnTU,37947
-npcpy-1.3.20.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-npcpy-1.3.20.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
-npcpy-1.3.20.dist-info/RECORD,,
+npcpy-1.3.21.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
+npcpy-1.3.21.dist-info/METADATA,sha256=OJthZtnT23usrcUIlB9ZcG1DgrhVX0SYy1jBrl765so,37947
+npcpy-1.3.21.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+npcpy-1.3.21.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
+npcpy-1.3.21.dist-info/RECORD,,