npcpy 1.2.23__py3-none-any.whl → 1.2.24__py3-none-any.whl

npcpy/npc_sysenv.py

@@ -63,7 +63,7 @@ warnings.filterwarnings("ignore", module="torch.serialization")
 os.environ["PYTHONWARNINGS"] = "ignore"
 os.environ["SDL_AUDIODRIVER"] = "dummy"
 
-def check_internet_connection(timeout=0.5):
+def check_internet_connection(timeout=5):
     """
     Checks for internet connectivity by trying to connect to a well-known host.
     """
@@ -87,16 +87,78 @@ def get_locally_available_models(project_directory, airplane_mode=False):
                         key, value = line.split("=", 1)
                         env_vars[key.strip()] = value.strip().strip("\"'")
 
-    
     internet_available = check_internet_connection()
     if not internet_available:
-        logging.info("No internet connection detected. External API calls will be skipped (effective airplane_mode).")
-        
+        logging.info(
+            "No internet connection detected. "
+            "External API calls will be skipped."
+        )
         airplane_mode = True
     else:
-        logging.info("Internet connection detected. Proceeding based on 'airplane_mode' parameter.")
+        logging.info(
+            "Internet connection detected. "
+            "Proceeding based on 'airplane_mode' parameter."
+        )
+    
+    custom_providers = load_custom_providers()
+    
+    for provider_name, config in custom_providers.items():
+        api_key_var = config.get('api_key_var')
+        if not api_key_var:
+            api_key_var = f"{provider_name.upper()}_API_KEY"
+        
+        if api_key_var in env_vars or os.environ.get(api_key_var):
+            try:
+                import requests
+                
+                def fetch_custom_models():
+                    base_url = config.get('base_url', '')
+                    headers = config.get('headers', {})
+                    
+                    api_key = env_vars.get(api_key_var) or \
+                              os.environ.get(api_key_var)
+                    if api_key:
+                        headers['Authorization'] = f'Bearer {api_key}'
+                    
+                    models_endpoint = f"{base_url.rstrip('/')}/models"
+                    response = requests.get(
+                        models_endpoint, 
+                        headers=headers,
+                        timeout=3.5
+                    )
+                    
+                    if response.status_code == 200:
+                        data = response.json()
+                        
+                        if isinstance(data, dict) and 'data' in data:
+                            return [
+                                m['id'] for m in data['data'] 
+                                if 'id' in m
+                            ]
+                        elif isinstance(data, list):
+                            return [
+                                m['id'] for m in data 
+                                if isinstance(m, dict) and 'id' in m
+                            ]
+                    return []
+                
+                models = fetch_custom_models()
+                for model in models:
+                    available_models[model] = provider_name
+                    
+                logging.info(
+                    f"Loaded {len(models)} models "
+                    f"from custom provider '{provider_name}'"
+                )
+                
+            except Exception as e:
+                logging.warning(
+                    f"Failed to load models from "
+                    f"custom provider '{provider_name}': {e}"
+                )
     
 
+    airplane_mode = False
     if not airplane_mode:
         timeout_seconds = 3.5
         
@@ -802,50 +864,116 @@ def load_env_from_execution_dir() -> None:
 
 
 
+
 def lookup_provider(model: str) -> str:
     """
-    Function Description:
-        This function determines the provider based on the model name.
+    Determine the provider based on the model name.
+    Checks custom providers first, then falls back to known providers.
+    
     Args:
-        model (str): The model name.
-    Keyword Args:
-        None
+        model: The model name
+        
     Returns:
-        str: The provider based on the model name.
+        The provider name or None if not found
     """
+    custom_providers = load_custom_providers()
+    
+    for provider_name, config in custom_providers.items():
+        if model.startswith(f"{provider_name}-"):
+            return provider_name
+        
+        try:
+            import requests
+            api_key_var = config.get('api_key_var') or \
+                         f"{provider_name.upper()}_API_KEY"
+            api_key = os.environ.get(api_key_var)
+            
+            if api_key:
+                base_url = config.get('base_url', '')
+                headers = config.get('headers', {})
+                headers['Authorization'] = f'Bearer {api_key}'
+                
+                models_endpoint = f"{base_url.rstrip('/')}/models"
+                response = requests.get(
+                    models_endpoint, 
+                    headers=headers, 
+                    timeout=1.0
+                )
+                
+                if response.status_code == 200:
+                    data = response.json()
+                    models = []
+                    
+                    if isinstance(data, dict) and 'data' in data:
+                        models = [m['id'] for m in data['data']]
+                    elif isinstance(data, list):
+                        models = [m['id'] for m in data]
+                    
+                    if model in models:
+                        return provider_name
+        except:
+            pass
+    
     if model == "deepseek-chat" or model == "deepseek-reasoner":
         return "deepseek"
+        
     ollama_prefixes = [
-        "llama",
-        "deepseek",
-        "qwen",
-        "llava",
-        "phi",
-        "mistral",
-        "mixtral",
-        "dolphin",
-        "codellama",
-        "gemma",
-    ]
+        "llama", "deepseek", "qwen", "llava", 
+        "phi", "mistral", "mixtral", "dolphin", 
+        "codellama", "gemma",]
     if any(model.startswith(prefix) for prefix in ollama_prefixes):
         return "ollama"
 
-    
     openai_prefixes = ["gpt-", "dall-e-", "whisper-", "o1"]
     if any(model.startswith(prefix) for prefix in openai_prefixes):
         return "openai"
 
-    
     if model.startswith("claude"):
         return "anthropic"
     if model.startswith("gemini"):
         return "gemini"
     if "diffusion" in model:
         return "diffusers"
+        
     return None
+
+
+def load_custom_providers():
+    """
+    Load custom provider configurations from .npcshrc
+    
+    Returns:
+        dict: Custom provider configurations keyed by provider name
+    """
+    custom_providers = {}
+    npcshrc_path = os.path.expanduser("~/.npcshrc")
+    
+    if os.path.exists(npcshrc_path):
+        with open(npcshrc_path, "r") as f:
+            for line in f:
+                line = line.split("#")[0].strip()
+                if "CUSTOM_PROVIDER_" in line and "=" in line:
+                    key, value = line.split("=", 1)
+                    key = key.strip().replace("export ", "")
+                    value = value.strip().strip("\"'")
+                    
+                    try:
+                        config = json.loads(value)
+                        provider_name = key.replace(
+                            "CUSTOM_PROVIDER_", ""
+                        ).lower()
+                        custom_providers[provider_name] = config
+                    except json.JSONDecodeError as e:
+                        logging.warning(
+                            f"Failed to parse custom provider {key}: {e}"
+                        )
+                        continue
+    
+    return custom_providers
 load_env_from_execution_dir()
 deepseek_api_key = os.getenv("DEEPSEEK_API_KEY", None)
 gemini_api_key = os.getenv("GEMINI_API_KEY", None)
 
 anthropic_api_key = os.getenv("ANTHROPIC_API_KEY", None)
 openai_api_key = os.getenv("OPENAI_API_KEY", None)
+

npcpy/serve.py

@@ -1942,7 +1942,7 @@ def stream():
 
                 print('.', end="", flush=True)
                 dot_count += 1
-                if "hf.co" in model or provider == 'ollama':
+                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"]:
@@ -1959,7 +1959,9 @@ def stream():
                     if chunk_content:
                         complete_response.append(chunk_content)
                     chunk_data = {
-                        "id": None, "object": None, "created": response_chunk["created_at"], "model": response_chunk["model"],
+                        "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")}]
                     }
                     yield f"data: {json.dumps(chunk_data)}\n\n"

{npcpy-1.2.23.dist-info → npcpy-1.2.24.dist-info}/METADATA

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

@@ -2,9 +2,9 @@ npcpy/__init__.py,sha256=9imxFtK74_6Rw9rz0kyMnZYl_voPb569tkTlYLt0Urg,131
 npcpy/llm_funcs.py,sha256=UkesCnRmclEoqBZPMZa2hKoSTjFzjxDCzPGKgeDegPQ,85101
 npcpy/main.py,sha256=RWoRIj6VQLxKdOKvdVyaq2kwG35oRpeXPvp1CAAoG-w,81
 npcpy/npc_compiler.py,sha256=10vu-9WUmlVzaFM_hMJH28iNS1IJXQP3Rb5RT1rZmpA,95326
-npcpy/npc_sysenv.py,sha256=lPYlKM_TeR4l4-Jcgiqq3CCge8b2oFHdfISD4L_G7eo,30308
+npcpy/npc_sysenv.py,sha256=H_A7BajE41W_r6TKt-uSUtMqruTHXIngYaRSPGQWFXE,35241
 npcpy/npcs.py,sha256=eExuVsbTfrRobTRRptRpDm46jCLWUgbvy4_U7IUQo-c,744
-npcpy/serve.py,sha256=O1dxISi0nQ6jsSOSxBXsULgkltnIcyBS6Z0AjfWmuXA,100296
+npcpy/serve.py,sha256=kc3j3puHJJEwUnXMY9nB6we93q1u32gOcRys87abJsM,100400
 npcpy/tools.py,sha256=A5_oVmZkzGnI3BI-NmneuxeXQq-r29PbpAZP4nV4jrc,5303
 npcpy/data/__init__.py,sha256=1tcoChR-Hjn905JDLqaW9ElRmcISCTJdE7BGXPlym2Q,642
 npcpy/data/audio.py,sha256=goon4HfsYgx0bI-n1lhkrzWPrJoejJlycXcB0P62pyk,11280
@@ -47,8 +47,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.2.23.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
-npcpy-1.2.23.dist-info/METADATA,sha256=-Q2qDZh5Khizw_PcCZnLCyIkMmFyworeU8gPzgEhBpY,29885
-npcpy-1.2.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcpy-1.2.23.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
-npcpy-1.2.23.dist-info/RECORD,,
+npcpy-1.2.24.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
+npcpy-1.2.24.dist-info/METADATA,sha256=yvWvzVYXVN4jzBRdSeDIGPWWEupFyzSIsAYKc88M5i0,29885
+npcpy-1.2.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+npcpy-1.2.24.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
+npcpy-1.2.24.dist-info/RECORD,,