npcpy 1.2.36__tar.gz → 1.3.1__tar.gz

{npcpy-1.2.36/npcpy.egg-info → npcpy-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcpy
-Version: 1.2.36
+Version: 1.3.1
 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
@@ -275,9 +275,8 @@ output = context['research_summary']
             "code": '''
 # Access outputs from previous steps.
 research_summary = context['initial_llm_research']
-# The output of a declarative jinx call (like 'file_reader') is stored under its step name.
-# The actual content we want is the 'output' of the *last step* within that sub-jinx.
-file_summary = context['read_and_process_source_file'].get('output', 'No file summary available.')
+# The file_reader jinx returns its output directly; also keep a fallback of file_raw_content.
+file_summary = context.get('read_and_process_source_file', '') or context.get('file_raw_content', 'No file summary available.')
 
 prompt = f"""Based on the following information:
 1. Comprehensive Research Summary:
@@ -607,6 +606,178 @@ else:
 The intention for this model ensembler system is to mimic human cognition: pattern-matched gut reactions (System 1 of Kahneman) for familiar queries, falling back to deliberate reasoning (System 2 of Kahneman) for novel problems. Genetic algorithms evolve both knowledge structures and model specializations over time.
 
 
+## NPCArray - NumPy for AI
+
+`npcpy` provides `NPCArray`, a NumPy-like interface for working with populations of models (LLMs, sklearn, PyTorch) at scale. Think of it as vectorized operations over AI models.
+
+### Core Concepts
+- Model arrays support vectorized operations
+- Operations are lazy until `.collect()` is called (like Spark)
+- Same interface works for single models (treated as length-1 arrays)
+- Supports ensemble voting, consensus, evolution, and more
+
+### Basic Usage
+
+```python
+from npcpy.npc_array import NPCArray
+
+# Create array of LLMs
+models = NPCArray.from_llms(
+    ['llama3.2', 'gemma3:1b'],
+    providers='ollama'
+)
+
+print(f"Model array shape: {models.shape}")  # (2,)
+
+# Inference across all models - returns shape (n_models, n_prompts)
+result = models.infer("What is 2+2? Just the number.").collect()
+
+print(f"Model 1: {result.data[0, 0]}")
+print(f"Model 2: {result.data[1, 0]}")
+```
+
+### Lazy Chaining & Ensemble Operations
+
+```python
+from npcpy.npc_array import NPCArray
+
+models = NPCArray.from_llms(['llama3.2', 'gemma3:1b', 'mistral:7b'])
+
+# Build lazy computation graph - nothing executed yet
+result = (
+    models
+    .infer("Is Python compiled or interpreted? One word.")
+    .map(lambda r: r.strip().lower())  # Clean responses
+    .vote(axis=0)  # Majority voting across models
+)
+
+# Show the computation plan
+result.explain()
+
+# Now execute
+answer = result.collect()
+print(f"Consensus: {answer.data[0]}")
+```
+
+### Parameter Sweeps with Meshgrid
+
+```python
+from npcpy.npc_array import NPCArray
+
+# Cartesian product over parameters
+configs = NPCArray.meshgrid(
+    models=['llama3.2', 'gemma3:1b'],
+    temperatures=[0.0, 0.5, 1.0]
+)
+
+print(f"Config array shape: {configs.shape}")  # (6,) = 2 models × 3 temps
+
+# Run inference with each config
+result = configs.infer("Complete: The quick brown fox").collect()
+```
+
+### Matrix Sampling with get_llm_response
+
+The `get_llm_response` function supports `matrix` and `n_samples` parameters for exploration:
+
+```python
+from npcpy.llm_funcs import get_llm_response
+
+# Matrix parameter - cartesian product over specified params
+result = get_llm_response(
+    "Write a creative opening line.",
+    matrix={
+        'model': ['llama3.2', 'gemma3:1b'],
+        'temperature': [0.5, 1.0]
+    }
+)
+print(f"Number of runs: {len(result['runs'])}")  # 4 = 2×2
+
+# n_samples - multiple samples from same config
+result = get_llm_response(
+    "Pick a random number 1-100.",
+    model='llama3.2',
+    n_samples=5
+)
+print(f"Samples: {[r['response'] for r in result['runs']]}")
+
+# Combine both for full exploration
+result = get_llm_response(
+    "Flip a coin: heads or tails?",
+    matrix={'model': ['llama3.2', 'gemma3:1b']},
+    n_samples=3  # 2 models × 3 samples = 6 runs
+)
+```
+
+### sklearn Integration
+
+```python
+from npcpy.npc_array import NPCArray
+from sklearn.ensemble import RandomForestClassifier
+from sklearn.linear_model import LogisticRegression
+import numpy as np
+
+# Create sample data
+X_train = np.random.randn(100, 4)
+y_train = (X_train[:, 0] > 0).astype(int)
+
+# Pre-fit models
+rf = RandomForestClassifier(n_estimators=10).fit(X_train, y_train)
+lr = LogisticRegression().fit(X_train, y_train)
+
+# Create array from fitted models
+models = NPCArray.from_sklearn([rf, lr])
+
+# Vectorized prediction
+X_test = np.random.randn(20, 4)
+predictions = models.predict(X_test).collect()
+
+print(f"RF predictions: {predictions.data[0]}")
+print(f"LR predictions: {predictions.data[1]}")
+```
+
+### ML Functions with Grid Search
+
+```python
+from npcpy.ml_funcs import fit_model, score_model, ensemble_predict
+
+# Grid search via matrix parameter
+result = fit_model(
+    X_train, y_train,
+    model='RandomForestClassifier',
+    matrix={
+        'n_estimators': [10, 50, 100],
+        'max_depth': [3, 5, 10]
+    }
+)
+
+print(f"Fitted {len(result['models'])} model configurations")
+
+# Ensemble voting with multiple models
+predictions = ensemble_predict(X_test, result['models'], method='vote')
+```
+
+### Quick Utilities
+
+```python
+from npcpy.npc_array import infer_matrix, ensemble_vote
+
+# Quick matrix inference
+result = infer_matrix(
+    prompts=["Hello", "Goodbye"],
+    models=['llama3.2', 'gemma3:1b']
+)
+
+# Quick ensemble vote
+answer = ensemble_vote(
+    "What is the capital of France? One word.",
+    models=['llama3.2', 'gemma3:1b']
+)
+print(f"Voted answer: {answer}")
+```
+
+See `examples/npc_array_examples.py` for more comprehensive examples.
+
 
 ## Serving an NPC Team
 

{npcpy-1.2.36 → npcpy-1.3.1}/README.md

@@ -179,9 +179,8 @@ output = context['research_summary']
             "code": '''
 # Access outputs from previous steps.
 research_summary = context['initial_llm_research']
-# The output of a declarative jinx call (like 'file_reader') is stored under its step name.
-# The actual content we want is the 'output' of the *last step* within that sub-jinx.
-file_summary = context['read_and_process_source_file'].get('output', 'No file summary available.')
+# The file_reader jinx returns its output directly; also keep a fallback of file_raw_content.
+file_summary = context.get('read_and_process_source_file', '') or context.get('file_raw_content', 'No file summary available.')
 
 prompt = f"""Based on the following information:
 1. Comprehensive Research Summary:
@@ -511,6 +510,178 @@ else:
 The intention for this model ensembler system is to mimic human cognition: pattern-matched gut reactions (System 1 of Kahneman) for familiar queries, falling back to deliberate reasoning (System 2 of Kahneman) for novel problems. Genetic algorithms evolve both knowledge structures and model specializations over time.
 
 
+## NPCArray - NumPy for AI
+
+`npcpy` provides `NPCArray`, a NumPy-like interface for working with populations of models (LLMs, sklearn, PyTorch) at scale. Think of it as vectorized operations over AI models.
+
+### Core Concepts
+- Model arrays support vectorized operations
+- Operations are lazy until `.collect()` is called (like Spark)
+- Same interface works for single models (treated as length-1 arrays)
+- Supports ensemble voting, consensus, evolution, and more
+
+### Basic Usage
+
+```python
+from npcpy.npc_array import NPCArray
+
+# Create array of LLMs
+models = NPCArray.from_llms(
+    ['llama3.2', 'gemma3:1b'],
+    providers='ollama'
+)
+
+print(f"Model array shape: {models.shape}")  # (2,)
+
+# Inference across all models - returns shape (n_models, n_prompts)
+result = models.infer("What is 2+2? Just the number.").collect()
+
+print(f"Model 1: {result.data[0, 0]}")
+print(f"Model 2: {result.data[1, 0]}")
+```
+
+### Lazy Chaining & Ensemble Operations
+
+```python
+from npcpy.npc_array import NPCArray
+
+models = NPCArray.from_llms(['llama3.2', 'gemma3:1b', 'mistral:7b'])
+
+# Build lazy computation graph - nothing executed yet
+result = (
+    models
+    .infer("Is Python compiled or interpreted? One word.")
+    .map(lambda r: r.strip().lower())  # Clean responses
+    .vote(axis=0)  # Majority voting across models
+)
+
+# Show the computation plan
+result.explain()
+
+# Now execute
+answer = result.collect()
+print(f"Consensus: {answer.data[0]}")
+```
+
+### Parameter Sweeps with Meshgrid
+
+```python
+from npcpy.npc_array import NPCArray
+
+# Cartesian product over parameters
+configs = NPCArray.meshgrid(
+    models=['llama3.2', 'gemma3:1b'],
+    temperatures=[0.0, 0.5, 1.0]
+)
+
+print(f"Config array shape: {configs.shape}")  # (6,) = 2 models × 3 temps
+
+# Run inference with each config
+result = configs.infer("Complete: The quick brown fox").collect()
+```
+
+### Matrix Sampling with get_llm_response
+
+The `get_llm_response` function supports `matrix` and `n_samples` parameters for exploration:
+
+```python
+from npcpy.llm_funcs import get_llm_response
+
+# Matrix parameter - cartesian product over specified params
+result = get_llm_response(
+    "Write a creative opening line.",
+    matrix={
+        'model': ['llama3.2', 'gemma3:1b'],
+        'temperature': [0.5, 1.0]
+    }
+)
+print(f"Number of runs: {len(result['runs'])}")  # 4 = 2×2
+
+# n_samples - multiple samples from same config
+result = get_llm_response(
+    "Pick a random number 1-100.",
+    model='llama3.2',
+    n_samples=5
+)
+print(f"Samples: {[r['response'] for r in result['runs']]}")
+
+# Combine both for full exploration
+result = get_llm_response(
+    "Flip a coin: heads or tails?",
+    matrix={'model': ['llama3.2', 'gemma3:1b']},
+    n_samples=3  # 2 models × 3 samples = 6 runs
+)
+```
+
+### sklearn Integration
+
+```python
+from npcpy.npc_array import NPCArray
+from sklearn.ensemble import RandomForestClassifier
+from sklearn.linear_model import LogisticRegression
+import numpy as np
+
+# Create sample data
+X_train = np.random.randn(100, 4)
+y_train = (X_train[:, 0] > 0).astype(int)
+
+# Pre-fit models
+rf = RandomForestClassifier(n_estimators=10).fit(X_train, y_train)
+lr = LogisticRegression().fit(X_train, y_train)
+
+# Create array from fitted models
+models = NPCArray.from_sklearn([rf, lr])
+
+# Vectorized prediction
+X_test = np.random.randn(20, 4)
+predictions = models.predict(X_test).collect()
+
+print(f"RF predictions: {predictions.data[0]}")
+print(f"LR predictions: {predictions.data[1]}")
+```
+
+### ML Functions with Grid Search
+
+```python
+from npcpy.ml_funcs import fit_model, score_model, ensemble_predict
+
+# Grid search via matrix parameter
+result = fit_model(
+    X_train, y_train,
+    model='RandomForestClassifier',
+    matrix={
+        'n_estimators': [10, 50, 100],
+        'max_depth': [3, 5, 10]
+    }
+)
+
+print(f"Fitted {len(result['models'])} model configurations")
+
+# Ensemble voting with multiple models
+predictions = ensemble_predict(X_test, result['models'], method='vote')
+```
+
+### Quick Utilities
+
+```python
+from npcpy.npc_array import infer_matrix, ensemble_vote
+
+# Quick matrix inference
+result = infer_matrix(
+    prompts=["Hello", "Goodbye"],
+    models=['llama3.2', 'gemma3:1b']
+)
+
+# Quick ensemble vote
+answer = ensemble_vote(
+    "What is the capital of France? One word.",
+    models=['llama3.2', 'gemma3:1b']
+)
+print(f"Voted answer: {answer}")
+```
+
+See `examples/npc_array_examples.py` for more comprehensive examples.
+
 
 ## Serving an NPC Team
 

npcpy-1.3.1/npcpy/__init__.py

@@ -0,0 +1,14 @@
+from . import npc_compiler
+from . import npc_sysenv
+from . import llm_funcs
+from . import ml_funcs
+from . import npc_array
+from . import sql
+from . import work
+from . import gen
+
+# Expose key classes at package level
+from .npc_array import NPCArray, ResponseTensor, LazyResult, infer_matrix, ensemble_vote
+from .npc_compiler import NPC, Team, Jinx
+from .llm_funcs import get_llm_response, check_llm_command, execute_llm_command
+from .ml_funcs import fit_model, predict_model, score_model, ensemble_predict

{npcpy-1.2.36 → npcpy-1.3.1}/npcpy/gen/image_gen.py

@@ -363,7 +363,8 @@ def generate_image(
     api_url: Optional[str] = None,
     attachments: Union[List[Union[str, bytes, Image.Image]], None] = None,
     save_path: Optional[str] = None,
-    custom_model_path: Optional[str] = None, # <--- NEW: Accept custom_model_path
+    custom_model_path: Optional[str] = None, # <--- NEW: Accept custom_model_path,
+    
 ):
     """
     Unified function to generate or edit images using various providers.
@@ -429,7 +430,9 @@ def generate_image(
             attachments=attachments,
             height=height,
             width=width,
-            n_images=n_images
+            n_images=n_images,
+            api_key=api_key
+            
         )
         all_generated_pil_images.extend(images)