npcpy 1.3.3__tar.gz → 1.3.4__tar.gz

{npcpy-1.3.3/npcpy.egg-info → npcpy-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcpy
-Version: 1.3.3
+Version: 1.3.4
 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.3 → npcpy-1.3.4}/npcpy/llm_funcs.py

@@ -14,6 +14,8 @@ from npcpy.npc_sysenv import (
     request_user_input, 
     get_system_message
 )
+
+
 from npcpy.gen.response import get_litellm_response
 from npcpy.gen.image_gen import generate_image
 from npcpy.gen.video_gen import generate_video_diffusers, generate_video_veo3
@@ -564,6 +566,7 @@ def check_llm_command(
     extra_globals=None,
     max_iterations: int = 5,
     jinxs: Dict = None,
+    tool_capable: bool = None,  # If None, will be auto-detected
 ):
     """
     Simple agent loop: try tool calling first, fall back to ReAct if unsupported.
@@ -571,27 +574,21 @@ def check_llm_command(
     if messages is None:
         messages = []
 
-    # Log incoming messages
-    import logging
-    logger = logging.getLogger("npcpy.llm_funcs")
-    logger.debug(f"[check_llm_command] Received {len(messages)} messages")
-    for i, msg in enumerate(messages[-5:]):  # Log last 5 messages
-        role = msg.get('role', 'unknown')
-        content = msg.get('content', '')
-        content_preview = content[:100] if isinstance(content, str) else str(type(content))
-        logger.debug(f"  [{i}] role={role}, content_preview={content_preview}...")
-
     total_usage = {"input_tokens": 0, "output_tokens": 0}
+
     # Use provided jinxs or get from npc/team
     if jinxs is None:
         jinxs = _get_jinxs(npc, team)
-    tools = _jinxs_to_tools(jinxs) if jinxs else None
+
+    # Only prepare tools if model supports them
+    tools = None
+    if tool_capable is not False and jinxs:
+        tools = _jinxs_to_tools(jinxs)
 
     # Keep full message history, only truncate for API calls to reduce tokens
     full_messages = messages.copy() if messages else []
-    logger.debug(f"[check_llm_command] full_messages initialized with {len(full_messages)} messages")
 
-    # Try with native tool calling first
+    # Make LLM call (with or without tools based on tool_capable)
 
     try:
         response = get_llm_response(
@@ -609,7 +606,7 @@ def check_llm_command(
             tools=tools,
         )
     except Exception as e:
-        print(colored(f"[check_llm_command] EXCEPTION in get_llm_response: {type(e).__name__}: {e}", "red"))
+        print(f"[check_llm_command] EXCEPTION in get_llm_response: {type(e).__name__}: {e}", "red")
         return {
             "messages": full_messages,
             "output": f"LLM call failed: {e}",
@@ -617,8 +614,6 @@ def check_llm_command(
             "usage": total_usage,
         }
 
-    if response.get("error"):
-        logger.warning(f"[check_llm_command] Error in response: {response.get('error')}")
 
     if response.get("usage"):
         total_usage["input_tokens"] += response["usage"].get("input_tokens", 0)
@@ -634,7 +629,6 @@ def check_llm_command(
         # For streaming, the caller (process_result) handles appending after consumption
         if assistant_response and isinstance(assistant_response, str):
             full_messages.append({"role": "assistant", "content": assistant_response})
-        logger.debug(f"[check_llm_command] No tool calls - returning {len(full_messages)} messages")
         return {
             "messages": full_messages,
             "output": assistant_response,
@@ -670,8 +664,7 @@ def check_llm_command(
         assistant_msg["tool_calls"] = _serialize_tool_calls(tool_calls)
     full_messages.append(assistant_msg)
     current_messages = full_messages
-    logger.debug(f"[check_llm_command] Tool calls detected - current_messages has {len(current_messages)} messages")
-    for iteration in range(max_iterations):
+    for _ in range(max_iterations):
         for tc in tool_calls:
             # Handle both dict and object formats
             if hasattr(tc, 'function'):
@@ -692,15 +685,12 @@ def check_llm_command(
 
             if jinx_name in jinxs:
                 try:
-                    from termcolor import colored
-                    print(colored(f"  ⚡ {jinx_name}", "cyan"), end="", flush=True)
+
+                    print((f"  ⚡ {jinx_name}", "cyan"), end="", flush=True)
                 except:
                     pass
                 output = _execute_jinx(jinxs[jinx_name], inputs, npc, team, current_messages, extra_globals)
-                try:
-                    print(colored(" ✓", "green"), flush=True)
-                except:
-                    pass
+
 
                 # Add tool result to messages
                 # Include name for Gemini compatibility
@@ -745,8 +735,6 @@ def check_llm_command(
             )
         except Exception as e:
             # If continuation fails, return what we have so far
-            # The tool was already executed successfully
-            logger.warning(f"[check_llm_command] Continuation failed: {e}")
             return {
                 "messages": current_messages,
                 "output": f"Tool executed successfully. (Continuation error: {type(e).__name__})",
@@ -767,14 +755,12 @@ def check_llm_command(
 
         if not tool_calls:
             # Done - return full message history
-            logger.debug(f"[check_llm_command] Tool loop done - returning {len(current_messages)} messages")
             return {
                 "messages": current_messages,
                 "output": assistant_response,
                 "usage": total_usage,
             }
 
-    logger.debug(f"[check_llm_command] Max iterations - returning {len(current_messages)} messages")
     return {
         "messages": current_messages,
         "output": response.get("response", "Max iterations reached"),
@@ -867,16 +853,11 @@ Use EXACT parameter names from the tool definitions above."""
                 context = f"Error: '{jinx_name}' not found. Available: {list(jinxs.keys())}"
                 continue
 
-            try:
-                from termcolor import colored
-                print(colored(f"  ⚡ {jinx_name}", "cyan"), end="", flush=True)
-            except:
-                pass
+
+
             output = _execute_jinx(jinxs[jinx_name], inputs, npc, team, current_messages, extra_globals)
-            try:
-                print(colored(" ✓", "green"), flush=True)
-            except:
-                pass
+
+
             context = f"Tool '{jinx_name}' returned: {output}"
             command = f"{command}\n\nPrevious: {context}"
 

{npcpy-1.3.3 → npcpy-1.3.4/npcpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcpy
-Version: 1.3.3
+Version: 1.3.4
 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.3 → npcpy-1.3.4}/setup.py

@@ -83,7 +83,7 @@ extra_files = package_files("npcpy/npc_team/")
 
 setup(
     name="npcpy",
-    version="1.3.3",
+    version="1.3.4",
     packages=find_packages(exclude=["tests*"]),
     install_requires=base_requirements,  
     extras_require={