npcpy 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

npcpy/gen/response.py

@@ -346,7 +346,12 @@ def get_ollama_response(
         res = ollama.chat(**api_params, options=options)
         result["raw_response"] = res
 
-        # Extract usage from ollama response
+        if stream:
+            # Return immediately for streaming - don't check 'in' on generator as it consumes it
+            result["response"] = res
+            return result
+
+        # Extract usage from ollama response (only for non-streaming)
         if hasattr(res, 'prompt_eval_count') or 'prompt_eval_count' in res:
             input_tokens = getattr(res, 'prompt_eval_count', None) or res.get('prompt_eval_count', 0) or 0
             output_tokens = getattr(res, 'eval_count', None) or res.get('eval_count', 0) or 0
@@ -354,10 +359,6 @@ def get_ollama_response(
                 "input_tokens": input_tokens,
                 "output_tokens": output_tokens,
             }
-
-        if stream:
-            result["response"] = res
-            return result
         else:
 
             message = res.get("message", {})

npcpy/npc_compiler.py

@@ -468,8 +468,8 @@ class Jinx:
         }
 
     def render_first_pass(
-        self, 
-        jinja_env_for_macros: Environment, 
+        self,
+        jinja_env_for_macros: Environment,
         all_jinx_callables: Dict[str, Callable]
     ):
         """
@@ -478,40 +478,44 @@ class Jinx:
         then expands nested Jinx calls (e.g., {{ sh(...) }} or engine: jinx_name)
         and inline macros.
         """
-        # 1. Join the list of raw steps (which are individual YAML lines) into a single string.
-        #    This single string is the complete Jinja template for the 'steps' section.
-        raw_steps_template_string = "\n".join(self._raw_steps)
-        
-        # 2. Render this single string as a Jinja template.
-        #    Jinja will now process the {% for %} and {% if %} directives,
-        #    dynamically generating the YAML structure.
-        try:
-            steps_template = jinja_env_for_macros.from_string(raw_steps_template_string)
-            # Pass globals (like num_tasks, include_greeting from Jinx inputs) 
-            # to the Jinja rendering context for structural templating.
-            rendered_steps_yaml_string = steps_template.render(**jinja_env_for_macros.globals)
-        except Exception as e:
-            # In a real Jinx, this would go to a proper logger.
-            # For this context, we handle the error gracefully.
-            # self._log_debug(f"Warning: Error during first-pass templating of Jinx '{self.jinx_name}' steps YAML: {e}")
-            self.steps = list(self._raw_steps) # Fallback to original raw steps
-            return
+        # Check if steps are already parsed dicts (common case when loaded from YAML)
+        # If so, skip the YAML string join/parse cycle and use them directly
+        if self._raw_steps and isinstance(self._raw_steps[0], dict):
+            structurally_expanded_steps = list(self._raw_steps)
+        else:
+            # 1. Join the list of raw steps (which are individual YAML lines) into a single string.
+            #    This single string is the complete Jinja template for the 'steps' section.
+            raw_steps_template_string = "\n".join(self._raw_steps)
 
-        # 3. Parse the rendered YAML string back into a list of step dictionaries.
-        #    This step will now correctly interpret the YAML structure generated by Jinja.
-        try:
-            structurally_expanded_steps = yaml.safe_load(rendered_steps_yaml_string)
-            if not isinstance(structurally_expanded_steps, list):
-                # Handle cases where the rendered YAML might be empty or not a list
-                if structurally_expanded_steps is None:
-                    structurally_expanded_steps = []
-                else:
-                    raise ValueError(f"Rendered steps YAML did not result in a list: {type(structurally_expanded_steps)}")
-            self.steps = structurally_expanded_steps
-        except Exception as e:
-            # self._log_debug(f"Warning: Error re-parsing structurally expanded steps YAML for Jinx '{self.jinx_name}': {e}")
-            self.steps = list(self._raw_steps) # Fallback
-            return
+            # 2. Render this single string as a Jinja template.
+            #    Jinja will now process the {% for %} and {% if %} directives,
+            #    dynamically generating the YAML structure.
+            try:
+                steps_template = jinja_env_for_macros.from_string(raw_steps_template_string)
+                # Pass globals (like num_tasks, include_greeting from Jinx inputs)
+                # to the Jinja rendering context for structural templating.
+                rendered_steps_yaml_string = steps_template.render(**jinja_env_for_macros.globals)
+            except Exception as e:
+                # In a real Jinx, this would go to a proper logger.
+                # For this context, we handle the error gracefully.
+                # self._log_debug(f"Warning: Error during first-pass templating of Jinx '{self.jinx_name}' steps YAML: {e}")
+                self.steps = list(self._raw_steps) # Fallback to original raw steps
+                return
+
+            # 3. Parse the rendered YAML string back into a list of step dictionaries.
+            #    This step will now correctly interpret the YAML structure generated by Jinja.
+            try:
+                structurally_expanded_steps = yaml.safe_load(rendered_steps_yaml_string)
+                if not isinstance(structurally_expanded_steps, list):
+                    # Handle cases where the rendered YAML might be empty or not a list
+                    if structurally_expanded_steps is None:
+                        structurally_expanded_steps = []
+                    else:
+                        raise ValueError(f"Rendered steps YAML did not result in a list: {type(structurally_expanded_steps)}")
+            except Exception as e:
+                # self._log_debug(f"Warning: Error re-parsing structurally expanded steps YAML for Jinx '{self.jinx_name}': {e}")
+                self.steps = list(self._raw_steps) # Fallback
+                return
 
         # 4. Now, iterate through these `structurally_expanded_steps` to expand
         # declarative Jinx calls (engine: jinx_name) and inline macros.

npcpy/serve.py

@@ -3901,26 +3901,41 @@ def stream():
                 print('.', end="", flush=True)
                 dot_count += 1
                 if "hf.co" in model or provider == 'ollama' and 'gpt-oss' not in model:
-                    chunk_content = response_chunk["message"]["content"] if "message" in response_chunk and "content" in response_chunk["message"] else ""
-                    if "message" in response_chunk and "tool_calls" in response_chunk["message"]:
-                        for tool_call in response_chunk["message"]["tool_calls"]:
-                            if "id" in tool_call:
-                                tool_call_data["id"] = tool_call["id"]
-                            if "function" in tool_call:
-                                if "name" in tool_call["function"]:
-                                    tool_call_data["function_name"] = tool_call["function"]["name"]
-                                if "arguments" in tool_call["function"]:
-                                    arg_val = tool_call["function"]["arguments"]
+                    # Ollama returns ChatResponse objects - support both attribute and dict access
+                    msg = getattr(response_chunk, "message", None) or response_chunk.get("message", {}) if hasattr(response_chunk, "get") else {}
+                    chunk_content = getattr(msg, "content", None) or (msg.get("content") if hasattr(msg, "get") else "") or ""
+                    # Extract Ollama thinking/reasoning tokens
+                    thinking_content = getattr(msg, "thinking", None) or (msg.get("thinking") if hasattr(msg, "get") else None)
+                    # Handle tool calls with robust attribute/dict access
+                    tool_calls = getattr(msg, "tool_calls", None) or (msg.get("tool_calls") if hasattr(msg, "get") else None)
+                    if tool_calls:
+                        for tool_call in tool_calls:
+                            tc_id = getattr(tool_call, "id", None) or (tool_call.get("id") if hasattr(tool_call, "get") else None)
+                            if tc_id:
+                                tool_call_data["id"] = tc_id
+                            tc_func = getattr(tool_call, "function", None) or (tool_call.get("function") if hasattr(tool_call, "get") else None)
+                            if tc_func:
+                                tc_name = getattr(tc_func, "name", None) or (tc_func.get("name") if hasattr(tc_func, "get") else None)
+                                if tc_name:
+                                    tool_call_data["function_name"] = tc_name
+                                tc_args = getattr(tc_func, "arguments", None) or (tc_func.get("arguments") if hasattr(tc_func, "get") else None)
+                                if tc_args:
+                                    arg_val = tc_args
                                     if isinstance(arg_val, dict):
                                         arg_val = json.dumps(arg_val)
                                     tool_call_data["arguments"] += arg_val
                     if chunk_content:
                         complete_response.append(chunk_content)
+                    # Extract other fields with robust access
+                    created_at = getattr(response_chunk, "created_at", None) or (response_chunk.get("created_at") if hasattr(response_chunk, "get") else None)
+                    model_name = getattr(response_chunk, "model", None) or (response_chunk.get("model") if hasattr(response_chunk, "get") else model)
+                    msg_role = getattr(msg, "role", None) or (msg.get("role") if hasattr(msg, "get") else "assistant")
+                    done_reason = getattr(response_chunk, "done_reason", None) or (response_chunk.get("done_reason") if hasattr(response_chunk, "get") else None)
                     chunk_data = {
                         "id": None, "object": None,
-                        "created": response_chunk["created_at"] or datetime.datetime.now(),
-                        "model": response_chunk["model"],
-                        "choices": [{"index": 0, "delta": {"content": chunk_content, "role": response_chunk["message"]["role"]}, "finish_reason": response_chunk.get("done_reason")}]
+                        "created": created_at or datetime.datetime.now(),
+                        "model": model_name,
+                        "choices": [{"index": 0, "delta": {"content": chunk_content, "role": msg_role, "reasoning_content": thinking_content}, "finish_reason": done_reason}]
                     }
                     yield f"data: {json.dumps(chunk_data)}\n\n"
                 else:

{npcpy-1.3.1.dist-info → npcpy-1.3.2.dist-info}/METADATA

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

@@ -3,10 +3,10 @@ npcpy/llm_funcs.py,sha256=KJpjN6q5iW_qdUfgt4tzYENCAu86376io8eFZ7wp76Y,78081
 npcpy/main.py,sha256=RWoRIj6VQLxKdOKvdVyaq2kwG35oRpeXPvp1CAAoG-w,81
 npcpy/ml_funcs.py,sha256=UI7k7JR4XOH_VXR-xxLaO4r9Kyx_jBaEnp3TUIY7ZLQ,22657
 npcpy/npc_array.py,sha256=fVTxcMiXV-lvltmuwaRnTU9D3ikPq3-7k5wzp7MA5OY,40224
-npcpy/npc_compiler.py,sha256=956ZMSSrYmVRp52-A4-wasg6wey3QIWHGGirDL-dW8o,111498
+npcpy/npc_compiler.py,sha256=X2BjMqKL7hbS37PPkSDGgZSF_PF_GNVGLd92ePRNRwQ,111868
 npcpy/npc_sysenv.py,sha256=rtE3KrXvIuOEpMq1CW5eK5K0o3f6mXagNXCeMnhHob4,36736
 npcpy/npcs.py,sha256=eExuVsbTfrRobTRRptRpDm46jCLWUgbvy4_U7IUQo-c,744
-npcpy/serve.py,sha256=wbIXUFlmfKg72ZYoX_cBJ8FVDFabHsGnbMwMIj-412Y,174839
+npcpy/serve.py,sha256=Nxigo7NR189RFDhdh3whVeWEyjTaopCzXfk6HsTJP4A,176384
 npcpy/tools.py,sha256=A5_oVmZkzGnI3BI-NmneuxeXQq-r29PbpAZP4nV4jrc,5303
 npcpy/data/__init__.py,sha256=1tcoChR-Hjn905JDLqaW9ElRmcISCTJdE7BGXPlym2Q,642
 npcpy/data/audio.py,sha256=3qryGXnWHa4JFMonjuX-lf0fCrF8jmbHe7mHAuOdua0,12397
@@ -29,7 +29,7 @@ npcpy/gen/audio_gen.py,sha256=w4toESu7nmli1T5FOwRRCGC_QK9W-SMWknYYkbRv9jE,635
 npcpy/gen/embeddings.py,sha256=QStTJ2ELiC379OEZsLEgGGIIFD267Y8zQchs7HRn2Zg,2089
 npcpy/gen/image_gen.py,sha256=VflU_wJsKWJarOVwZtL2M8ymDFfKNz8WX66Rwk4obeo,21778
 npcpy/gen/ocr.py,sha256=rgmXWHrCYX1Po-qG_LrNFbVYEZ8aaupxFTgparcoB_Y,6554
-npcpy/gen/response.py,sha256=xSFHNZTDsebFo_nptWwSahpCU9_4pbCqabMFZ3X4_Bg,39979
+npcpy/gen/response.py,sha256=8oZRRmoh85RyR6sgGsk-H6cpXcCjkBsn-8Wix0mW3bE,40101
 npcpy/gen/video_gen.py,sha256=RFi3Zcq_Hn3HIcfoF3mijQ6G7RYFZaM_9pjPTh-8E64,3239
 npcpy/memory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 npcpy/memory/command_history.py,sha256=vWzZ4F4o0XOSHn50SkdP885jG1aZIZvfcPAh8EZWlQk,54497
@@ -50,8 +50,8 @@ npcpy/work/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.1.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
-npcpy-1.3.1.dist-info/METADATA,sha256=dbTBVm4ZMDwwnGkOC3Ahwwhf9OpcecBO_Tdww1ToUwE,37884
-npcpy-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcpy-1.3.1.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
-npcpy-1.3.1.dist-info/RECORD,,
+npcpy-1.3.2.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
+npcpy-1.3.2.dist-info/METADATA,sha256=KmIJEKnatu027fuhR2XJQs7kNlrqaVgzTqG4eKQECCc,37884
+npcpy-1.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+npcpy-1.3.2.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
+npcpy-1.3.2.dist-info/RECORD,,