signalwire-sdk 3.0.2.dev63__tar.gz → 3.0.2.dev65__tar.gz

{signalwire_sdk-3.0.2.dev63 → signalwire_sdk-3.0.2.dev65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: signalwire-sdk
-Version: 3.0.2.dev63
+Version: 3.0.2.dev65
 Summary: SignalWire SDK
 Author-email: SignalWire Team <info@signalwire.com>
 License: MIT

{signalwire_sdk-3.0.2.dev63 → signalwire_sdk-3.0.2.dev65}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "signalwire-sdk"
-version = "3.0.2.dev63"
+version = "3.0.2.dev65"
 description = "SignalWire SDK"
 authors = [
     {name = "SignalWire Team", email = "info@signalwire.com"}
@@ -166,6 +166,40 @@ signalwire = [
 target-version = "py310"
 line-length = 88
 
+[tool.ruff.lint]
+# E4/E7/E9 + F are the ruff defaults (E501 line-length intentionally excluded —
+# formatting is owned by `ruff format`, not the linter). B = flake8-bugbear
+# (likely-bug patterns), S = flake8-bandit (security smells).
+select = ["E4", "E7", "E9", "F", "B", "S", "C4", "PERF", "SIM", "PTH", "RET", "RUF", "UP"]
+
+[tool.ruff.lint.per-file-ignores]
+# Tests are built on assert; bandit's S101 is noise there.
+"tests/**" = ["S101"]
+# sw-agent-dokku is a developer-run deploy CLI that shells out to git/ssh with
+# fixed list-form arg vectors (shell=False, so no shell interpolation). The
+# dynamic parts (app name, dokku host, config vars) are the operator's own CLI
+# args for their own deployment — not untrusted server input. S603 (subprocess
+# call) and S607 (partial executable path: git/ssh resolved via PATH, the normal
+# idiom) are expected and safe across this file.
+"signalwire/signalwire/cli/dokku.py" = ["S603", "S607"]
+
+[tool.ruff.lint.flake8-bugbear]
+# FastAPI's dependency-injection idiom puts Depends()/Query()/etc. in argument
+# defaults on purpose; B008 (function-call-in-default) is a false positive for it.
+# Both the bare (`from fastapi import Depends`) and qualified forms are listed
+# because the code imports these names directly.
+extend-immutable-calls = [
+    "Depends", "fastapi.Depends",
+    "Query", "fastapi.Query",
+    "Body", "fastapi.Body",
+    "Header", "fastapi.Header",
+    "Cookie", "fastapi.Cookie",
+    "Path", "fastapi.Path",
+    "Form", "fastapi.Form",
+    "File", "fastapi.File",
+    "Security", "fastapi.Security",
+]
+
 [tool.mypy]
 python_version = "3.10"
 files = ["signalwire/signalwire"]

{signalwire_sdk-3.0.2.dev63 → signalwire_sdk-3.0.2.dev65}/signalwire/signalwire/__init__.py

@@ -17,7 +17,7 @@ from .core.logging_config import configure_logging
 
 configure_logging()
 
-__version__ = "3.0.2.dev63"
+__version__ = "3.0.2.dev65"
 
 # Import core classes for easier access.
 # These imports are intentionally placed after configure_logging() so the SDK's
@@ -148,26 +148,26 @@ def RestClient(*args, **kwargs):
 __all__ = [
     "AgentBase",
     "AgentServer",
-    "SWMLService",
-    "SWMLBuilder",
-    "FunctionResult",
-    "SWAIGFunction",
-    "DataMap",
-    "create_simple_api_tool",
-    "create_expression_tool",
-    "ContextBuilder",
+    "BedrockAgent",
     "Context",
-    "Step",
+    "ContextBuilder",
+    "DataMap",
+    "FunctionResult",
     "GatherInfo",
     "GatherQuestion",
-    "create_simple_context",
-    "SwaigFunctionResult",
+    "RestClient",
+    "SWAIGFunction",
+    "SWMLBuilder",
+    "SWMLService",
     "SchemaValidationError",
+    "Step",
+    "SwaigFunctionResult",
     "WebService",
+    "add_skill_directory",
+    "create_expression_tool",
+    "create_simple_api_tool",
+    "create_simple_context",
     "list_skills",
     "list_skills_with_params",
     "register_skill",
-    "add_skill_directory",
-    "BedrockAgent",
-    "RestClient",
 ]

{signalwire_sdk-3.0.2.dev63 → signalwire_sdk-3.0.2.dev65}/signalwire/signalwire/agent_server.py

@@ -11,7 +11,9 @@ AgentServer - Class for hosting multiple SignalWire AI Agents in a single server
 
 import os
 import re
-from typing import Dict, Any, Optional, List, Tuple, Callable
+from pathlib import Path
+from typing import Any
+from collections.abc import Callable
 
 try:
     from fastapi import FastAPI, Request, Response
@@ -19,11 +21,12 @@ try:
 except ImportError:
     raise ImportError(
         "fastapi and uvicorn are required. Install them with: pip install fastapi uvicorn"
-    )
+    ) from None
 
 from signalwire.core.agent_base import AgentBase
 from signalwire.core.swml_service import SWMLService
 from signalwire.core.logging_config import get_logger
+import contextlib
 
 
 class AgentServer:
@@ -41,7 +44,10 @@ class AgentServer:
     """
 
     def __init__(
-        self, host: str = "0.0.0.0", port: int = 3000, log_level: str = "info"
+        self,
+        host: str = "0.0.0.0",  # noqa: S104  # intended server default: listen on all interfaces (overridable)
+        port: int = 3000,
+        log_level: str = "info",
     ):
         """
         Initialize a new agent server
@@ -61,7 +67,7 @@ class AgentServer:
         self.app = FastAPI(
             title="SignalWire AI Agents",
             description="Hosted SignalWire AI Agents",
-            version="3.0.2.dev63",
+            version="3.0.2.dev65",
             redirect_slashes=False,
             docs_url=None,
             redoc_url=None,
@@ -83,12 +89,12 @@ class AgentServer:
             return response
 
         # Keep track of registered agents
-        self.agents: Dict[str, AgentBase] = {}
+        self.agents: dict[str, AgentBase] = {}
 
         # Keep track of SIP routing configuration
         self._sip_routing_enabled = False
-        self._sip_route: Optional[str] = None
-        self._sip_username_mapping: Dict[str, str] = {}  # Maps SIP usernames to routes
+        self._sip_route: str | None = None
+        self._sip_username_mapping: dict[str, str] = {}  # Maps SIP usernames to routes
 
         # Register health endpoints immediately so they're available
         # whether using server.run() or server.app with gunicorn
@@ -101,7 +107,7 @@ class AgentServer:
         async def _setup_catch_all():
             self._register_catch_all_handler()
 
-    def register(self, agent: AgentBase, route: Optional[str] = None) -> None:
+    def register(self, agent: AgentBase, route: str | None = None) -> None:
         """
         Register an agent with the server
 
@@ -183,8 +189,8 @@ class AgentServer:
 
         # Create a unified routing callback that checks all registered usernames
         def server_sip_routing_callback(
-            request: Request, body: Dict[str, Any]
-        ) -> Optional[str]:
+            request: Request, body: dict[str, Any]
+        ) -> str | None:
             """Unified SIP routing callback that checks all registered usernames"""
             # Extract the SIP username
             sip_username = SWMLService.extract_sip_username(body)
@@ -198,10 +204,7 @@ class AgentServer:
                 if target_route:
                     self.logger.info(f"Routing SIP request to {target_route}")
                     return target_route
-                else:
-                    self.logger.warning(
-                        f"No route found for SIP username: {sip_username}"
-                    )
+                self.logger.warning(f"No route found for SIP username: {sip_username}")
 
             # No routing needed (will be handled by the current agent)
             return None
@@ -246,7 +249,7 @@ class AgentServer:
         self._sip_username_mapping[username.lower()] = route
         self.logger.info(f"Registered SIP username '{username}' to route '{route}'")
 
-    def _lookup_sip_route(self, username: str) -> Optional[str]:
+    def _lookup_sip_route(self, username: str) -> str | None:
         """
         Look up the route for a SIP username
 
@@ -311,7 +314,7 @@ class AgentServer:
         self.logger.info("agent_unregistered", extra={"route": route})
         return True
 
-    def get_agents(self) -> List[Tuple[str, AgentBase]]:
+    def get_agents(self) -> list[tuple[str, AgentBase]]:
         """
         Get all registered agents
 
@@ -320,7 +323,7 @@ class AgentServer:
         """
         return [(route, agent) for route, agent in self.agents.items()]
 
-    def get_agent(self, route: str) -> Optional[AgentBase]:
+    def get_agent(self, route: str) -> AgentBase | None:
         """
         Get an agent by route
 
@@ -342,8 +345,8 @@ class AgentServer:
         self,
         event=None,
         context=None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
+        host: str | None = None,
+        port: int | None = None,
     ) -> Any:
         """
         Universal run method that automatically detects environment and handles accordingly
@@ -372,11 +375,10 @@ class AgentServer:
 
         if mode == "cgi":
             return self._handle_cgi_request()
-        elif mode == "lambda":
+        if mode == "lambda":
             return self._handle_lambda_request(event, context)
-        else:
-            # Server mode - use existing logic
-            return self._run_server(host, port)
+        # Server mode - use existing logic
+        return self._run_server(host, port)
 
     def _handle_cgi_request(self) -> str:
         """Handle CGI request using same routing logic as server"""
@@ -405,7 +407,7 @@ class AgentServer:
                         swml, content_type="application/json"
                     )
                 except Exception as e:
-                    self.logger.error(f"Failed to generate SWML: {str(e)}")
+                    self.logger.error(f"Failed to generate SWML: {e!s}")
                     error_response = {"error": "Failed to generate SWML"}
                     return self._format_cgi_response(
                         error_response, status="500 Internal Server Error"
@@ -449,7 +451,7 @@ class AgentServer:
                         )
 
                     except Exception as e:
-                        self.logger.error(f"SWAIG function failed: {str(e)}")
+                        self.logger.error(f"SWAIG function failed: {e!s}")
                         error_response = {"error": "SWAIG function failed"}
                         return self._format_cgi_response(
                             error_response, status="500 Internal Server Error"
@@ -499,7 +501,7 @@ class AgentServer:
                         )
 
                     except Exception as e:
-                        self.logger.error(f"Function call failed: {str(e)}")
+                        self.logger.error(f"Function call failed: {e!s}")
                         error_response = {"error": "Function call failed"}
                         return self._format_cgi_response(
                             error_response, status="500 Internal Server Error"
@@ -544,7 +546,7 @@ class AgentServer:
                         "body": json.dumps(swml) if isinstance(swml, dict) else swml,
                     }
                 except Exception as e:
-                    self.logger.error(f"Failed to generate SWML: {str(e)}")
+                    self.logger.error(f"Failed to generate SWML: {e!s}")
                     return {
                         "statusCode": 500,
                         "headers": {"Content-Type": "application/json"},
@@ -568,10 +570,8 @@ class AgentServer:
                         # Get POST data from Lambda event body
                         post_data = {}
                         if event and "body" in event and event["body"]:
-                            try:
+                            with contextlib.suppress(json.JSONDecodeError, ValueError):
                                 post_data = json.loads(event["body"])
-                            except (json.JSONDecodeError, ValueError):
-                                pass
 
                         result = agent._execute_swaig_function(
                             function_name, post_data, None, None
@@ -585,7 +585,7 @@ class AgentServer:
                         }
 
                     except Exception as e:
-                        self.logger.error(f"Function call failed: {str(e)}")
+                        self.logger.error(f"Function call failed: {e!s}")
                         return {
                             "statusCode": 500,
                             "headers": {"Content-Type": "application/json"},
@@ -607,10 +607,7 @@ class AgentServer:
         import sys
 
         # Format the body
-        if isinstance(data, dict):
-            body = json.dumps(data)
-        else:
-            body = str(data)
+        body = json.dumps(data) if isinstance(data, dict) else str(data)
 
         # Build CGI response with headers
         response_lines = [
@@ -648,9 +645,7 @@ class AgentServer:
         def readiness_check():
             return {"status": "ready", "agents": len(self.agents)}
 
-    def _run_server(
-        self, host: Optional[str] = None, port: Optional[int] = None
-    ) -> None:
+    def _run_server(self, host: str | None = None, port: int | None = None) -> None:
         """Original server mode logic"""
         if not self.agents:
             self.logger.warning("Starting server with no registered agents")
@@ -668,10 +663,10 @@ class AgentServer:
 
         # Validate SSL configuration if enabled
         if ssl_enabled:
-            if not ssl_cert_path or not os.path.exists(ssl_cert_path):
+            if not ssl_cert_path or not Path(ssl_cert_path).exists():
                 self.logger.warning(f"SSL cert not found: {ssl_cert_path}")
                 ssl_enabled = False
-            elif not ssl_key_path or not os.path.exists(ssl_key_path):
+            elif not ssl_key_path or not Path(ssl_key_path).exists():
                 self.logger.warning(f"SSL key not found: {ssl_key_path}")
                 ssl_enabled = False
 
@@ -687,7 +682,7 @@ class AgentServer:
             display_host = f"{host}:{port}"
 
         self.logger.info(f"Starting server on {protocol}://{display_host}")
-        for route, agent in self.agents.items():
+        for agent in self.agents.values():
             # include_source defaults False -> 2-tuple at runtime; index to
             # avoid the union-tuple unpack ambiguity mypy sees.
             creds = agent.get_basic_auth_credentials()
@@ -714,7 +709,7 @@ class AgentServer:
             uvicorn.run(self.app, host=host, port=port, log_level=self.log_level)
 
     def register_global_routing_callback(
-        self, callback_fn: Callable[[Request, Dict[str, Any]], Optional[str]], path: str
+        self, callback_fn: Callable[[Request, dict[str, Any]], str | None], path: str
     ) -> None:
         """
         Register a routing callback across all agents
@@ -785,9 +780,7 @@ class AgentServer:
             f"Serving static files from '{directory}' at route '{route or '/'}'"
         )
 
-    def _serve_static_file(
-        self, file_path: str, route: str = "/"
-    ) -> Optional[Response]:
+    def _serve_static_file(self, file_path: str, route: str = "/") -> Response | None:
         """
         Internal method to serve a static file.
 
@@ -860,7 +853,7 @@ class AgentServer:
                 if full_path == route.lstrip("/"):
                     # This is a request to an agent's root without trailing slash
                     return await agent._handle_root_request(request)
-                elif full_path.startswith(route.lstrip("/") + "/"):
+                if full_path.startswith(route.lstrip("/") + "/"):
                     # This is a request to an agent's sub-path
                     relative_path = full_path[len(route.lstrip("/")) :]
                     relative_path = relative_path.lstrip("/")
@@ -872,21 +865,18 @@ class AgentServer:
                     clean_path = relative_path.rstrip("/")
                     if clean_path == "debug":
                         return await agent._handle_debug_request(request)
-                    elif clean_path == "swaig":
+                    if clean_path == "swaig":
                         from fastapi import Response
 
                         return await agent._handle_swaig_request(request, Response())
-                    elif clean_path == "post_prompt":
+                    if clean_path == "post_prompt":
                         return await agent._handle_post_prompt_request(request)
-                    elif clean_path == "check_for_input":
+                    if clean_path == "check_for_input":
                         return await agent._handle_check_for_input_request(request)
 
                     # Check for custom routing callbacks
                     if hasattr(agent, "_routing_callbacks"):
-                        for (
-                            callback_path,
-                            callback_fn,
-                        ) in agent._routing_callbacks.items():
+                        for callback_path in agent._routing_callbacks:
                             cb_path_clean = callback_path.strip("/")
                             if clean_path == cb_path_clean:
                                 request.state.callback_path = callback_path
@@ -895,7 +885,7 @@ class AgentServer:
             # No matching agent - check for static files
             if hasattr(self, "_static_directories"):
                 # Check each static directory route
-                for static_route, static_dir in self._static_directories.items():
+                for static_route in self._static_directories:
                     # For root static route, serve any unmatched path
                     if static_route == "" or static_route == "/":
                         response = self._serve_static_file(full_path, "")

{signalwire_sdk-3.0.2.dev63 → signalwire_sdk-3.0.2.dev65}/signalwire/signalwire/agents/bedrock.py

@@ -14,7 +14,7 @@ with all SignalWire agent features like skills, POM, and SWAIG functions.
 """
 
 import json
-from typing import Dict, Any, Optional
+from typing import Any
 from signalwire.core.agent_base import AgentBase
 from signalwire.core.logging_config import get_logger
 
@@ -41,7 +41,7 @@ class BedrockAgent(AgentBase):
         self,
         name: str = "bedrock_agent",
         route: str = "/bedrock",
-        system_prompt: Optional[str] = None,
+        system_prompt: str | None = None,
         voice_id: str = "matthew",
         temperature: float = 0.7,
         top_p: float = 0.9,
@@ -77,7 +77,7 @@ class BedrockAgent(AgentBase):
         logger.info(f"BedrockAgent initialized: {name} on route {route}")
 
     def _render_swml(
-        self, call_id: Optional[str] = None, modifications: Optional[dict] = None
+        self, call_id: str | None = None, modifications: dict | None = None
     ) -> str:
         """
         Render SWML document with amazon_bedrock verb
@@ -143,7 +143,7 @@ class BedrockAgent(AgentBase):
         # Convert back to JSON string
         return json.dumps(swml)
 
-    def _add_voice_to_prompt(self, prompt_config: Dict[str, Any]) -> Dict[str, Any]:
+    def _add_voice_to_prompt(self, prompt_config: dict[str, Any]) -> dict[str, Any]:
         """
         Add voice configuration to the prompt object
 
@@ -176,7 +176,7 @@ class BedrockAgent(AgentBase):
 
         return filtered_config
 
-    def _build_bedrock_params(self, base_params: Dict[str, Any]) -> Dict[str, Any]:
+    def _build_bedrock_params(self, base_params: dict[str, Any]) -> dict[str, Any]:
         """
         Build Bedrock-specific parameters
 
@@ -214,9 +214,9 @@ class BedrockAgent(AgentBase):
 
     def set_inference_params(
         self,
-        temperature: Optional[float] = None,
-        top_p: Optional[float] = None,
-        max_tokens: Optional[int] = None,
+        temperature: float | None = None,
+        top_p: float | None = None,
+        max_tokens: int | None = None,
     ) -> None:
         """
         Update Bedrock inference parameters

{signalwire_sdk-3.0.2.dev63 → signalwire_sdk-3.0.2.dev65}/signalwire/signalwire/cli/build_search.py

@@ -11,7 +11,7 @@ import argparse
 import sys
 from pathlib import Path
 from datetime import datetime
-from typing import List, cast
+from typing import cast
 from urllib.parse import urlparse, urlunparse
 
 from signalwire.search.models import MODEL_ALIASES, DEFAULT_MODEL, resolve_model_alias
@@ -27,7 +27,7 @@ def _mask_connection_string(conn_str):
                 + (f":{parsed.port}" if parsed.port else "")
             )
             return urlunparse(masked)
-    except Exception:
+    except Exception:  # noqa: S110  # best-effort password masking for display; falls through to "****" on any parse failure
         pass
     return "****"
 
@@ -538,7 +538,7 @@ Examples:
                             },
                         }
 
-                        with open(json_path, "w", encoding="utf-8") as f:
+                        with json_path.open("w", encoding="utf-8") as f:
                             json.dump(chunk_data, f, indent=2, ensure_ascii=False)
 
                         chunk_files_created.append(json_path)
@@ -548,7 +548,7 @@ Examples:
                         # Accumulate all chunks for single file output
                         all_chunks.extend(chunks)
 
-                except Exception as e:
+                except Exception as e:  # noqa: PERF203  # per-iteration error isolation: one failed file must not abort the batch
                     print(f"Error processing {file_path}: {e}")
                     if args.verbose:
                         import traceback
@@ -567,7 +567,7 @@ Examples:
                     },
                 }
 
-                with open(args.output, "w", encoding="utf-8") as f:
+                with Path(args.output).open("w", encoding="utf-8") as f:
                     json.dump(output_data, f, indent=2, ensure_ascii=False)
 
                 print(f"✓ Exported {len(all_chunks)} chunks to {args.output}")
@@ -577,7 +577,7 @@ Examples:
                 )
                 total_chunks = 0
                 for chunk_file in chunk_files_created:
-                    with open(chunk_file) as fh:
+                    with chunk_file.open() as fh:
                         total_chunks += len(json.load(fh)["chunks"])
                 print(f"  Total chunks: {total_chunks}")
 
@@ -634,7 +634,11 @@ Examples:
             # Check if the index was actually created
             import os
 
-            if os.path.exists(args.output):
+            # Rationale for PTH110 suppression below: tests patch global
+            # os.path.exists separately from pathlib.Path.exists to drive this
+            # post-build check; Path.exists() would pick up the unrelated Path
+            # mock and break the test seam.
+            if os.path.exists(args.output):  # noqa: PTH110
                 print(f"\n✓ Search index created successfully: {args.output}")
             else:
                 print("\n✗ Search index creation failed - no files were processed")
@@ -771,10 +775,11 @@ def search_command():
         args.model = MODEL_ALIASES[args.model]
 
     # Validate keyword weight if provided
-    if args.keyword_weight is not None:
-        if args.keyword_weight < 0.0 or args.keyword_weight > 1.0:
-            print("Error: --keyword-weight must be between 0.0 and 1.0")
-            sys.exit(1)
+    if args.keyword_weight is not None and (
+        args.keyword_weight < 0.0 or args.keyword_weight > 1.0
+    ):
+        print("Error: --keyword-weight must be between 0.0 and 1.0")
+        sys.exit(1)
 
     # Validate backend configuration
     if args.backend == "pgvector" and not args.connection_string:
@@ -861,9 +866,7 @@ def search_command():
                         print("  help           - Show this help")
                         print("  exit/quit/q    - Exit shell")
                         print(
-                            "  count=N        - Set result count (current: {})".format(
-                                args.count
-                            )
+                            f"  count=N        - Set result count (current: {args.count})"
                         )
                         print(
                             "  tags=tag1,tag2 - Set tag filter (current: {})".format(
@@ -922,7 +925,7 @@ def search_command():
                     # Perform search
                     results = engine.search(
                         query_vector=cast(
-                            List[float], enhanced.get("vector")
+                            list[float], enhanced.get("vector")
                         ),  # vector is None for keyword-only search; search() tolerates it at runtime
                         enhanced_text=enhanced.get("enhanced_text", query),
                         count=args.count,
@@ -1007,7 +1010,7 @@ def search_command():
         # Perform search
         results = engine.search(
             query_vector=cast(
-                List[float], enhanced.get("vector")
+                list[float], enhanced.get("vector")
             ),  # vector is None for keyword-only search; search() tolerates it at runtime
             enhanced_text=enhanced.get("enhanced_text", args.query),
             count=args.count,
@@ -1540,17 +1543,17 @@ Examples:
             sys.argv.pop(1)
             validate_command()
             return
-        elif sys.argv[1] == "search":
+        if sys.argv[1] == "search":
             # Remove 'search' from argv and call search_command
             sys.argv.pop(1)
             search_command()
             return
-        elif sys.argv[1] == "remote":
+        if sys.argv[1] == "remote":
             # Remove 'remote' from argv and call remote_command
             sys.argv.pop(1)
             remote_command()
             return
-        elif sys.argv[1] == "migrate":
+        if sys.argv[1] == "migrate":
             # Remove 'migrate' from argv and call migrate_command
             sys.argv.pop(1)
             migrate_command()