signalwire-agents 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

signalwire_agents/__init__.py

@@ -18,7 +18,7 @@ A package for building AI agents using SignalWire's AI and SWML capabilities.
 from .core.logging_config import configure_logging
 configure_logging()
 
-__version__ = "1.0.14"
+__version__ = "1.0.16"
 
 # Import core classes for easier access
 from .core.agent_base import AgentBase

signalwire_agents/agent_server.py

@@ -76,6 +76,13 @@ class AgentServer:
         # Register health endpoints immediately so they're available
         # whether using server.run() or server.app with gunicorn
         self._register_health_endpoints()
+
+        # Register catch-all handler on startup (not in __init__) so it runs AFTER
+        # all other routes are registered. This ensures custom routes like /get_token
+        # don't get overshadowed by the catch-all /{full_path:path} route.
+        @self.app.on_event("startup")
+        async def _setup_catch_all():
+            self._register_catch_all_handler()
     
     def register(self, agent: AgentBase, route: Optional[str] = None) -> None:
         """
@@ -104,12 +111,12 @@ class AgentServer:
             
         # Store the agent
         self.agents[route] = agent
-        
+
         # Get the router and register it using the standard approach
         # The agent's router already handles both trailing slash versions properly
         router = agent.as_router()
         self.app.include_router(router, prefix=route)
-        
+
         self.logger.info(f"Registered agent '{agent.get_name()}' at route '{route}'")
         
         # If SIP routing is enabled and auto-mapping is on, register SIP usernames for this agent
@@ -550,9 +557,6 @@ class AgentServer:
         if not self.agents:
             self.logger.warning("Starting server with no registered agents")
 
-        # Register catch-all route handler (handles agent routing and static files)
-        self._register_catch_all_handler()
-
         # Set host and port
         host = host or self.host
         port = port or self.port
@@ -682,9 +686,6 @@ class AgentServer:
 
         self.logger.info(f"Serving static files from '{directory}' at route '{route or '/'}'")
 
-        # Register catch-all handler immediately so it works with gunicorn
-        # (when using server.app directly instead of server.run())
-        self._register_catch_all_handler()
 
     def _serve_static_file(self, file_path: str, route: str = "/") -> Optional[Response]:
         """
@@ -742,14 +743,10 @@ class AgentServer:
         1. Routing requests without trailing slashes to agents (e.g., /santa instead of /santa/)
         2. Serving static files from directories registered with serve_static_files()
 
-        The handler is registered once and works with both server.run() and
-        direct use of server.app with gunicorn/uvicorn.
+        Called via startup event (not __init__) to ensure it runs AFTER all other routes
+        are registered. This prevents the catch-all from overshadowing custom routes
+        like /get_token that users may add to server.app.
         """
-        # Only register once
-        if getattr(self, '_catch_all_registered', False):
-            return
-        self._catch_all_registered = True
-
         @self.app.get("/{full_path:path}")
         @self.app.post("/{full_path:path}")
         async def handle_all_routes(request: Request, full_path: str):

signalwire_agents/cli/dokku.py

@@ -92,7 +92,7 @@ PROCFILE_TEMPLATE = """web: gunicorn app:app --bind 0.0.0.0:$PORT --workers 2 --
 RUNTIME_TEMPLATE = """python-3.11
 """
 
-REQUIREMENTS_TEMPLATE = """signalwire-agents>=1.0.13
+REQUIREMENTS_TEMPLATE = """signalwire-agents>=1.0.16
 gunicorn>=21.0.0
 uvicorn>=0.24.0
 python-dotenv>=1.0.0
@@ -150,8 +150,8 @@ SIGNALWIRE_TOKEN=your-api-token
 # This should be your publicly accessible URL (e.g., ngrok, dokku domain)
 SWML_PROXY_URL_BASE=https://your-app.example.com
 
-# Basic Auth for SWML endpoints (recommended)
-SWML_BASIC_AUTH_USER=admin
+# Basic Auth for SWML endpoints (password required, user defaults to 'signalwire')
+# SWML_BASIC_AUTH_USER=signalwire
 SWML_BASIC_AUTH_PASSWORD=your-secure-password
 
 # Agent Configuration
@@ -383,8 +383,8 @@ def setup_swml_handler():
     project = os.getenv("SIGNALWIRE_PROJECT_ID", "")
     token = os.getenv("SIGNALWIRE_TOKEN", "")
     agent_name = os.getenv("AGENT_NAME", "{agent_slug}")
-    proxy_url = os.getenv("SWML_PROXY_URL_BASE", "")
-    auth_user = os.getenv("SWML_BASIC_AUTH_USER", "")
+    proxy_url = os.getenv("SWML_PROXY_URL_BASE", os.getenv("APP_URL", ""))
+    auth_user = os.getenv("SWML_BASIC_AUTH_USER", "signalwire")
     auth_pass = os.getenv("SWML_BASIC_AUTH_PASSWORD", "")
 
     if not all([sw_host, project, token]):
@@ -395,8 +395,8 @@ def setup_swml_handler():
         print("SWML_PROXY_URL_BASE not set - skipping SWML handler setup")
         return
 
-    # Build SWML URL with basic auth
-    if auth_user and auth_pass and "://" in proxy_url:
+    # Build SWML URL with basic auth (user defaults to 'signalwire' if not set)
+    if auth_pass and "://" in proxy_url:
         scheme, rest = proxy_url.split("://", 1)
         swml_url = f"{{scheme}}://{{auth_user}}:{{auth_pass}}@{{rest}}/swml"
     else:
@@ -411,19 +411,17 @@ def setup_swml_handler():
         swml_handler_info["address_id"] = existing["address_id"]
         swml_handler_info["address"] = existing["address"]
 
-        if existing.get("url") != swml_url:
-            try:
-                requests.put(
-                    f"https://{{sw_host}}/api/fabric/resources/external_swml_handlers/{{existing['id']}}",
-                    json={{"primary_request_url": swml_url, "primary_request_method": "POST"}},
-                    auth=auth,
-                    headers=headers
-                )
-                print(f"Updated SWML handler: {{existing['name']}}")
-            except Exception as e:
-                print(f"Failed to update handler URL: {{e}}")
-        else:
-            print(f"Using existing SWML handler: {{existing['name']}}")
+        # Always update the URL on startup to ensure credentials are current
+        try:
+            requests.put(
+                f"https://{{sw_host}}/api/fabric/resources/external_swml_handlers/{{existing['id']}}",
+                json={{"primary_request_url": swml_url, "primary_request_method": "POST"}},
+                auth=auth,
+                headers=headers
+            )
+            print(f"Updated SWML handler: {{existing['name']}}")
+        except Exception as e:
+            print(f"Failed to update handler URL: {{e}}")
         print(f"Call address: {{existing['address']}}")
     else:
         try:
@@ -1111,9 +1109,11 @@ curl -X POST <span class="base-url"></span>/swml/swaig/ \\
             return div.innerHTML;
         }}
 
-        // WebRTC calling
+        // WebRTC calling - robust pattern from santa app.js
         let client = null;
         let roomSession = null;
+        let currentToken = null;
+        let currentDestination = null;
 
         const connectBtn = document.getElementById('connectBtn');
         const disconnectBtn = document.getElementById('disconnectBtn');
@@ -1125,8 +1125,15 @@ curl -X POST <span class="base-url"></span>/swml/swaig/ \\
         }}
 
         async function connect() {{
+            // Debounce - prevent double-clicks
+            if (connectBtn.disabled) {{
+                console.log('Call already in progress');
+                return;
+            }}
+            connectBtn.disabled = true;
+            connectBtn.textContent = 'Connecting...';
+
             try {{
-                connectBtn.disabled = true;
                 updateCallStatus('Getting token...');
 
                 const tokenResp = await fetch('/get_token');
@@ -1136,17 +1143,28 @@ curl -X POST <span class="base-url"></span>/swml/swaig/ \\
                     throw new Error(tokenData.error);
                 }}
 
+                currentToken = tokenData.token;
+                currentDestination = tokenData.address;
+
                 if (tokenData.address) {{
                     destinationInput.value = tokenData.address;
                 }}
 
+                console.log('Got token, destination:', currentDestination);
                 updateCallStatus('Connecting...');
 
-                client = await window.SignalWire.SignalWire({{
-                    token: tokenData.token
-                }});
+                // Initialize SignalWire client
+                if (window.SignalWire && typeof window.SignalWire.SignalWire === 'function') {{
+                    console.log('Initializing SignalWire client...');
+                    client = await window.SignalWire.SignalWire({{
+                        token: currentToken
+                    }});
+                }} else {{
+                    console.error('SignalWire SDK structure:', window.SignalWire);
+                    throw new Error('SignalWire.SignalWire function not found');
+                }}
 
-                const destination = tokenData.address || destinationInput.value;
+                const destination = currentDestination || destinationInput.value;
                 roomSession = await client.dial({{
                     to: destination,
                     audio: {{
@@ -1157,22 +1175,37 @@ curl -X POST <span class="base-url"></span>/swml/swaig/ \\
                     video: false
                 }});
 
+                console.log('Room session created:', roomSession);
+
                 roomSession.on('call.joined', () => {{
+                    console.log('Call joined');
                     updateCallStatus('Connected');
                     disconnectBtn.disabled = false;
                 }});
 
                 roomSession.on('call.left', () => {{
+                    console.log('Call left');
                     updateCallStatus('Call ended');
                     cleanup();
                 }});
 
                 roomSession.on('destroy', () => {{
+                    console.log('Session destroyed');
                     updateCallStatus('Call ended');
                     cleanup();
                 }});
 
+                roomSession.on('room.left', () => {{
+                    console.log('Room left');
+                    cleanup();
+                }});
+
                 await roomSession.start();
+                console.log('Call started successfully');
+
+                // Update UI
+                connectBtn.style.display = 'none';
+                disconnectBtn.style.display = 'inline-block';
 
             }} catch (err) {{
                 console.error('Connection error:', err);
@@ -1182,26 +1215,65 @@ curl -X POST <span class="base-url"></span>/swml/swaig/ \\
         }}
 
         async function disconnect() {{
+            console.log('Disconnect called');
+            await hangup();
+        }}
+
+        async function hangup() {{
             try {{
                 if (roomSession) {{
+                    console.log('Hanging up call...');
                     await roomSession.hangup();
+                    console.log('Call hung up successfully');
                 }}
             }} catch (err) {{
-                console.error('Disconnect error:', err);
+                console.error('Hangup error:', err);
             }}
             cleanup();
         }}
 
         function cleanup() {{
+            console.log('Cleanup called');
+
+            // Clean up local stream if it exists
+            if (roomSession && roomSession.localStream) {{
+                console.log('Stopping local stream tracks');
+                roomSession.localStream.getTracks().forEach(track => {{
+                    track.stop();
+                }});
+            }}
+
+            roomSession = null;
+
+            // Disconnect the client properly
+            if (client) {{
+                try {{
+                    console.log('Disconnecting client');
+                    client.disconnect();
+                }} catch (e) {{
+                    console.log('Client disconnect error:', e);
+                }}
+                client = null;
+            }}
+
+            // Reset UI
             connectBtn.disabled = false;
+            connectBtn.textContent = 'Call Agent';
+            connectBtn.style.display = 'inline-block';
             disconnectBtn.disabled = true;
-            roomSession = null;
-            client = null;
+            disconnectBtn.style.display = 'none';
         }}
 
         connectBtn.addEventListener('click', connect);
         disconnectBtn.addEventListener('click', disconnect);
 
+        // Clean up on page unload
+        window.addEventListener('beforeunload', () => {{
+            if (roomSession) {{
+                hangup();
+            }}
+        }});
+
         // Initialize on load
         document.addEventListener('DOMContentLoaded', async function() {{
             const baseUrl = window.location.origin;
@@ -1448,7 +1520,7 @@ swaig-test app.py --list-tools
 # Templates - CI/CD Mode
 # =============================================================================
 
-DEPLOY_WORKFLOW_TEMPLATE = '''# Auto-deploy to Dokku on push
+DEPLOY_WORKFLOW_TEMPLATE = '''# Deploy to Dokku - calls reusable workflow from dokku-deploy-system
 name: Deploy
 
 on:
@@ -1456,138 +1528,24 @@ on:
   push:
     branches: [main, staging, develop]
 
+permissions:
+  contents: read
+  deployments: write
+
 concurrency:
   group: deploy-${{{{ github.ref }}}}
   cancel-in-progress: true
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
-    environment: ${{{{ github.ref_name == 'main' && 'production' || github.ref_name == 'staging' && 'staging' || 'development' }}}}
-    env:
-      BASE_APP_NAME: ${{{{ github.event.repository.name }}}}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set variables
-        id: vars
-        run: |
-          BRANCH="${{GITHUB_REF#refs/heads/}}"
-          case "$BRANCH" in
-            main)    APP="${{BASE_APP_NAME}}"; ENV="production" ;;
-            staging) APP="${{BASE_APP_NAME}}-staging"; ENV="staging" ;;
-            develop) APP="${{BASE_APP_NAME}}-dev"; ENV="development" ;;
-            *)       APP="${{BASE_APP_NAME}}"; ENV="production" ;;
-          esac
-          echo "app_name=$APP" >> $GITHUB_OUTPUT
-          echo "environment=$ENV" >> $GITHUB_OUTPUT
-
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh && chmod 700 ~/.ssh
-          echo "${{{{ secrets.DOKKU_SSH_PRIVATE_KEY }}}}" > ~/.ssh/key && chmod 600 ~/.ssh/key
-          ssh-keyscan -H ${{{{ secrets.DOKKU_HOST }}}} >> ~/.ssh/known_hosts
-          echo -e "Host dokku\\n  HostName ${{{{ secrets.DOKKU_HOST }}}}\\n  User dokku\\n  IdentityFile ~/.ssh/key" > ~/.ssh/config
-
-      - name: Create app
-        run: |
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          ssh dokku apps:exists $APP_NAME 2>/dev/null || ssh dokku apps:create $APP_NAME
-
-      - name: Unlock app
-        run: |
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          ssh dokku apps:unlock $APP_NAME 2>/dev/null || true
-
-      - name: Configure env
-        run: |
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          DOMAIN="${{APP_NAME}}.${{{{ secrets.BASE_DOMAIN }}}}"
-          ssh dokku config:set --no-restart $APP_NAME \\
-            APP_ENV="${{{{ steps.vars.outputs.environment }}}}" \\
-            APP_URL="https://${{DOMAIN}}" \\
-            SWML_BASIC_AUTH_USER="${{{{ secrets.SWML_BASIC_AUTH_USER }}}}" \\
-            SWML_BASIC_AUTH_PASSWORD="${{{{ secrets.SWML_BASIC_AUTH_PASSWORD }}}}"
-
-      - name: Deploy
-        run: |
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          git remote add dokku dokku@${{{{ secrets.DOKKU_HOST }}}}:$APP_NAME 2>/dev/null || true
-          GIT_SSH_COMMAND="ssh -i ~/.ssh/key" git push dokku HEAD:main -f
-
-      - name: Configure domain
-        run: |
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          DOMAIN="${{APP_NAME}}.${{{{ secrets.BASE_DOMAIN }}}}"
-          ssh dokku domains:clear $APP_NAME 2>/dev/null || true
-          ssh dokku domains:add $APP_NAME $DOMAIN
-
-      - name: SSL
-        run: |
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          echo "Checking SSL status..."
-          SSL_STATUS=$(ssh dokku letsencrypt:active $APP_NAME 2>/dev/null || echo "error")
-          echo "SSL status: $SSL_STATUS"
-          if [ "$SSL_STATUS" = "true" ]; then
-            echo "SSL already active"
-          else
-            echo "Enabling SSL..."
-            ssh dokku letsencrypt:enable $APP_NAME 2>&1 || echo "SSL enable failed"
-          fi
-
-      - name: Verify
-        id: verify
-        run: |
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          DOMAIN="${{APP_NAME}}.${{{{ secrets.BASE_DOMAIN }}}}"
-          sleep 10
-          if curl -sf "https://${{DOMAIN}}/health"; then
-            echo "HTTPS OK: https://${{DOMAIN}}"
-            echo "status=success" >> $GITHUB_OUTPUT
-            echo "url=https://${{DOMAIN}}" >> $GITHUB_OUTPUT
-          elif curl -sf "http://${{DOMAIN}}/health"; then
-            echo "HTTP only: http://${{DOMAIN}}"
-            echo "status=success" >> $GITHUB_OUTPUT
-            echo "url=http://${{DOMAIN}}" >> $GITHUB_OUTPUT
-          else
-            echo "Check logs"
-            echo "status=failed" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Notify Slack
-        if: always()
-        env:
-          SLACK_WEBHOOK_URL: ${{{{ secrets.SLACK_WEBHOOK_URL }}}}
-        run: |
-          [ -z "$SLACK_WEBHOOK_URL" ] && exit 0
-          APP_NAME="${{{{ steps.vars.outputs.app_name }}}}"
-          DOMAIN="${{APP_NAME}}.${{{{ secrets.BASE_DOMAIN }}}}"
-          if [ "${{{{ steps.verify.outputs.status }}}}" == "success" ]; then
-            COLOR="good"
-            STATUS="✅ Deployed"
-          else
-            COLOR="danger"
-            STATUS="❌ Deploy failed"
-          fi
-          curl -X POST -H 'Content-type: application/json' \\
-            --data "{{
-              \\"attachments\\": [{{
-                \\"color\\": \\"$COLOR\\",
-                \\"title\\": \\"$STATUS: $APP_NAME\\",
-                \\"fields\\": [
-                  {{\\"title\\": \\"Environment\\", \\"value\\": \\"${{{{ steps.vars.outputs.environment }}}}\\", \\"short\\": true}},
-                  {{\\"title\\": \\"Branch\\", \\"value\\": \\"${{{{ github.ref_name }}}}\\", \\"short\\": true}},
-                  {{\\"title\\": \\"URL\\", \\"value\\": \\"https://$DOMAIN\\", \\"short\\": false}}
-                ],
-                \\"footer\\": \\"<${{{{ github.server_url }}}}/${{{{ github.repository }}}}/actions/runs/${{{{ github.run_id }}}}|View Workflow>\\"
-              }}]
-            }}" \\
-            "$SLACK_WEBHOOK_URL" || true
+    uses: signalwire-demos/dokku-deploy-system/.github/workflows/deploy.yml@main
+    secrets: inherit
+    # Optional: customize health check path
+    # with:
+    #   health_check_path: '/health'
 '''
 
-PREVIEW_WORKFLOW_TEMPLATE = '''# Preview environments for pull requests
+PREVIEW_WORKFLOW_TEMPLATE = '''# Preview environments for pull requests - calls reusable workflow from dokku-deploy-system
 name: Preview
 
 on:
@@ -1597,74 +1555,13 @@ on:
 concurrency:
   group: preview-${{{{ github.event.pull_request.number }}}}
 
-env:
-  APP_NAME: ${{{{ github.event.repository.name }}}}-pr-${{{{ github.event.pull_request.number }}}}
-
 jobs:
-  deploy:
-    if: github.event.action != 'closed'
-    runs-on: ubuntu-latest
-    environment: preview
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh && chmod 700 ~/.ssh
-          echo "${{{{ secrets.DOKKU_SSH_PRIVATE_KEY }}}}" > ~/.ssh/key && chmod 600 ~/.ssh/key
-          ssh-keyscan -H ${{{{ secrets.DOKKU_HOST }}}} >> ~/.ssh/known_hosts
-
-      - name: Create app
-        run: |
-          ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} apps:exists $APP_NAME 2>/dev/null || \\
-            ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} apps:create $APP_NAME
-
-      - name: Configure env
-        run: |
-          DOMAIN="${{{{ env.APP_NAME }}}}.${{{{ secrets.BASE_DOMAIN }}}}"
-          ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} config:set --no-restart $APP_NAME \\
-            APP_ENV=preview \\
-            APP_URL="https://$DOMAIN"
-          ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} resource:limit $APP_NAME --memory 256m || true
-
-      - name: Deploy
-        run: |
-          git remote add dokku dokku@${{{{ secrets.DOKKU_HOST }}}}:$APP_NAME 2>/dev/null || true
-          GIT_SSH_COMMAND="ssh -i ~/.ssh/key" git push dokku HEAD:main -f
-
-      - name: Configure domain
-        run: |
-          DOMAIN="${{{{ env.APP_NAME }}}}.${{{{ secrets.BASE_DOMAIN }}}}"
-          ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} domains:clear $APP_NAME 2>/dev/null || true
-          ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} domains:add $APP_NAME $DOMAIN
-
-      - name: SSL
-        run: |
-          ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} letsencrypt:enable $APP_NAME || true
-
-      - name: Comment URL
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const url = `https://${{{{ env.APP_NAME }}}}.${{{{ secrets.BASE_DOMAIN }}}}`;
-            const body = `## 🚀 Preview\\n\\n✅ Deployed: [${{url}}](${{url}})\\n\\n<sub>Auto-destroyed on PR close</sub>`;
-            const comments = await github.rest.issues.listComments({{owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number}});
-            const bot = comments.data.find(c => c.user.type === 'Bot' && c.body.includes('Preview'));
-            if (bot) await github.rest.issues.updateComment({{owner: context.repo.owner, repo: context.repo.repo, comment_id: bot.id, body}});
-            else await github.rest.issues.createComment({{owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number, body}});
-
-  cleanup:
-    if: github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Destroy preview
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{{{ secrets.DOKKU_SSH_PRIVATE_KEY }}}}" > ~/.ssh/key && chmod 600 ~/.ssh/key
-          ssh-keyscan -H ${{{{ secrets.DOKKU_HOST }}}} >> ~/.ssh/known_hosts
-          ssh -i ~/.ssh/key dokku@${{{{ secrets.DOKKU_HOST }}}} apps:destroy ${{{{ env.APP_NAME }}}} --force || true
+  preview:
+    uses: signalwire-demos/dokku-deploy-system/.github/workflows/preview.yml@main
+    secrets: inherit
+    # Optional: customize memory limit for previews
+    # with:
+    #   memory_limit: '256m'
 '''
 
 DOKKU_CONFIG_TEMPLATE = '''# ═══════════════════════════════════════════════════════════════════════════════

signalwire_agents/core/agent_base.py

@@ -109,7 +109,7 @@ class AgentBase(
         name: str,
         route: str = "/",
         host: str = "0.0.0.0",
-        port: int = 3000,
+        port: Optional[int] = None,
         basic_auth: Optional[Tuple[str, str]] = None,
         use_pom: bool = True,
         token_expiry_secs: int = 3600,
@@ -162,7 +162,8 @@ class AgentBase(
         # Apply service config values, with constructor parameters taking precedence
         final_route = route if route != "/" else service_config.get('route', route)
         final_host = host if host != "0.0.0.0" else service_config.get('host', host)
-        final_port = port if port != 3000 else service_config.get('port', port)
+        # For port: use explicit param if provided, else config file, else let SWMLService use PORT env var
+        final_port = port if port is not None else service_config.get('port', None)
         final_name = service_config.get('name', name)
         
         # Initialize the SWMLService base class
@@ -182,7 +183,7 @@ class AgentBase(
         
         # Setup logger for this instance
         self.log = logger.bind(agent=name)
-        self.log.info("agent_initializing", route=route, host=host, port=port)
+        self.log.info("agent_initializing", agent=name, route=route, host=self.host, port=self.port)
         
         # Store agent-specific parameters
         self._default_webhook_url = default_webhook_url

signalwire_agents/core/swml_service.py

@@ -64,7 +64,7 @@ class SWMLService:
         name: str,
         route: str = "/",
         host: str = "0.0.0.0",
-        port: int = 3000,
+        port: Optional[int] = None,
         basic_auth: Optional[Tuple[str, str]] = None,
         schema_path: Optional[str] = None,
         config_file: Optional[str] = None
@@ -84,7 +84,8 @@ class SWMLService:
         self.name = name
         self.route = route.rstrip("/")  # Ensure no trailing slash
         self.host = host
-        self.port = port
+        # Use provided port, or PORT env var, or default to 3000
+        self.port = port if port is not None else int(os.environ.get("PORT", 3000))
         
         # Initialize logger for this instance FIRST before using it
         self.log = logger.bind(service=name)
@@ -107,7 +108,7 @@ class SWMLService:
                            proxy_url_base=self._proxy_url_base)
         self._proxy_detection_done = False
         self._proxy_debug = os.environ.get('SWML_PROXY_DEBUG', '').lower() in ('true', '1', 'yes')
-        self.log.info("service_initializing", route=self.route, host=host, port=port)
+        self.log.info("service_initializing", route=self.route, host=self.host, port=self.port)
         
         # Set basic auth credentials
         if basic_auth is not None:

{signalwire_agents-1.0.14.dist-info → signalwire_agents-1.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: signalwire_agents
-Version: 1.0.14
+Version: 1.0.16
 Summary: SignalWire AI Agents SDK
 Author-email: SignalWire Team <info@signalwire.com>
 License: MIT

{signalwire_agents-1.0.14.dist-info → signalwire_agents-1.0.16.dist-info}/RECORD

@@ -1,11 +1,11 @@
-signalwire_agents/__init__.py,sha256=LLus0vh58wwELjWZMPFsFhOM3CvoCo4LI866TXdJXn4,5031
-signalwire_agents/agent_server.py,sha256=dOPaATEnw03rHsfH5sqmmGPF7uzFffcUJYpTksx7CBg,32356
+signalwire_agents/__init__.py,sha256=V45feASkAUfqV6O_9oDDgh-uCsoFoR9nYuN0J9-8jEk,5031
+signalwire_agents/agent_server.py,sha256=seNZqNy2XFx6lIaRfMhFz3xC-z8Y9OIRmc0H_BhrVHk,32346
 signalwire_agents/schema.json,sha256=YQv4-KiegE00XvxoLMKAml6aCGitnt3kBq31ECxTHK8,385886
 signalwire_agents/agents/bedrock.py,sha256=J582gooNtxtep4xdVOfyDzRtHp_XrurPMS93xf2Xod0,10836
 signalwire_agents/cli/__init__.py,sha256=XbxAQFaCIdGXIXJiriVBWoFPOJsC401u21588nO4TG8,388
 signalwire_agents/cli/build_search.py,sha256=wDuonVY9fcqspThRHmbArTuZLKsiStu-ozVExtqawA8,54937
 signalwire_agents/cli/config.py,sha256=2i4e0BArdKsaXxjeueYYRNke7GWicHPYC2wuitVrP7A,2541
-signalwire_agents/cli/dokku.py,sha256=BiTCrF7m-LpxN-95xVt-M6zzFjBedpJI2nbK2Vpxt6g,85342
+signalwire_agents/cli/dokku.py,sha256=WuyqErWPZ-Wyqfxlzb3DyPhkyrSropUYzHtTuqzjGiM,80255
 signalwire_agents/cli/init_project.py,sha256=nNBPni3x1xzdJ5pAZsQRUYK1t1e64NzwUUkq-Uc3mzo,78835
 signalwire_agents/cli/swaig_test_wrapper.py,sha256=t63HQpEc1Up5AcysEHP1OsEQcgSMKH-9H1L2IhFso18,1533
 signalwire_agents/cli/test_swaig.py,sha256=-v-XjTUWZNxmMJuOF5_cB1Jz8x8emJoqgqS_8jLeT4Y,31487
@@ -26,7 +26,7 @@ signalwire_agents/cli/simulation/data_generation.py,sha256=pxa9aJ6XkI0O8yAIGvBTU
 signalwire_agents/cli/simulation/data_overrides.py,sha256=3_3pT6j-q2gRufPX2bZ1BrmY7u1IdloLooKAJil33vI,6319
 signalwire_agents/cli/simulation/mock_env.py,sha256=fvaR_xdLMm8AbpNUbTJOFG9THcti3Zds-0QNDbKMaYk,10249
 signalwire_agents/core/__init__.py,sha256=xjPq8DmUnWYUG28sd17n430VWPmMH9oZ9W14gYwG96g,806
-signalwire_agents/core/agent_base.py,sha256=PYlLu312TRnZVTePUSZTrd6Ed6uvy7K6BIxT3Sd6uNM,58739
+signalwire_agents/core/agent_base.py,sha256=zZRykB8VD277_5_NZbYP7ZcpeqTdQ4yWlpNnLXOljEY,58883
 signalwire_agents/core/auth_handler.py,sha256=jXrof9WZ1W9qqlQT9WElcmSRafL2kG7207x5SqWN9MU,8481
 signalwire_agents/core/config_loader.py,sha256=rStVRRUaeMGrMc44ocr0diMQQARZhbKqwMqQ6kqUNos,8722
 signalwire_agents/core/contexts.py,sha256=g9FgOGMfGCUWlm57YZcv7CvOf-Ub9FdKZIOMu14ADfE,24428
@@ -41,7 +41,7 @@ signalwire_agents/core/swaig_function.py,sha256=KnUQ2g99kDSzOzD1PJ0Iqs8DeeZ6jDII
 signalwire_agents/core/swml_builder.py,sha256=tJBFDAVTENEfjGLp2h9_AKOYt5O9FrSYLI-nZZVwM1E,15604
 signalwire_agents/core/swml_handler.py,sha256=hFDq41dQWL3EdFbq6h0hizE1dIqdVeiTeCrujbZsPzo,8397
 signalwire_agents/core/swml_renderer.py,sha256=-WAB_5ss836a8nBo5zlb6SaQKFNF4XIo1odWIXM4eE8,6860
-signalwire_agents/core/swml_service.py,sha256=vgK_OScBlXdsr3dMe7pLUnm_cQVWtmNl_lu5guAKDlg,49851
+signalwire_agents/core/swml_service.py,sha256=TCsn3g_kAxz1DfSiPygpBv6KTd6EEDaWplFVqZZnZw8,49995
 signalwire_agents/core/agent/__init__.py,sha256=qccTmLD9b24tZDAoIPEY6vJ2p1R_ArZ_ZCKbBlKvPQ8,239
 signalwire_agents/core/agent/config/__init__.py,sha256=5XvTfnYeeGdoLr4tJjbe1OhF26nOcR5VTDIhtMGCu3I,244
 signalwire_agents/core/agent/deployment/__init__.py,sha256=4Mr7baQ_xR_hfJ72YxQRAT_GFa663YjFX_PumJ35Xds,191
@@ -136,12 +136,12 @@ signalwire_agents/utils/token_generators.py,sha256=4Mr7baQ_xR_hfJ72YxQRAT_GFa663
 signalwire_agents/utils/validators.py,sha256=4Mr7baQ_xR_hfJ72YxQRAT_GFa663YjFX_PumJ35Xds,191
 signalwire_agents/web/__init__.py,sha256=XE_pSTY9Aalzr7J7wqFth1Zr3cccQHPPcF5HWNrOpz8,383
 signalwire_agents/web/web_service.py,sha256=a2PSHJgX1tlZr0Iz1A1UouZjXEePJAZL632evvLVM38,21071
-signalwire_agents-1.0.14.data/data/share/man/man1/sw-agent-init.1,sha256=J4k5Oi74BnWCPCvsaw00vuyyqDPuIECjJIPu5OynvJc,8381
-signalwire_agents-1.0.14.data/data/share/man/man1/sw-search.1,sha256=9jJ6V6t6DgmXByz8Lw9exjf683Cw3sJGro8-eB0M9EY,10413
-signalwire_agents-1.0.14.data/data/share/man/man1/swaig-test.1,sha256=Ri0EITo8YMFowkcYltwPSwU4VJdRzo7XTWloi5WddCg,7815
-signalwire_agents-1.0.14.dist-info/licenses/LICENSE,sha256=NYvAsB-rTcSvG9cqHt9EUHAWLiA9YzM4Qfz-mPdvDR0,1067
-signalwire_agents-1.0.14.dist-info/METADATA,sha256=eqJAF8GpapKMkB059C3t7emIKbHJg-C5q6Mn7yjtqdQ,41740
-signalwire_agents-1.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-signalwire_agents-1.0.14.dist-info/entry_points.txt,sha256=fMiBH-GLeXGaWWn58Mcj7KM_m3SdomQMUQu-1LTqscw,315
-signalwire_agents-1.0.14.dist-info/top_level.txt,sha256=kDGS6ZYv84K9P5Kyg9_S8P_pbUXoHkso0On_DB5bbWc,18
-signalwire_agents-1.0.14.dist-info/RECORD,,
+signalwire_agents-1.0.16.data/data/share/man/man1/sw-agent-init.1,sha256=J4k5Oi74BnWCPCvsaw00vuyyqDPuIECjJIPu5OynvJc,8381
+signalwire_agents-1.0.16.data/data/share/man/man1/sw-search.1,sha256=9jJ6V6t6DgmXByz8Lw9exjf683Cw3sJGro8-eB0M9EY,10413
+signalwire_agents-1.0.16.data/data/share/man/man1/swaig-test.1,sha256=Ri0EITo8YMFowkcYltwPSwU4VJdRzo7XTWloi5WddCg,7815
+signalwire_agents-1.0.16.dist-info/licenses/LICENSE,sha256=NYvAsB-rTcSvG9cqHt9EUHAWLiA9YzM4Qfz-mPdvDR0,1067
+signalwire_agents-1.0.16.dist-info/METADATA,sha256=k6ccgQKIyiYHtoXP3iqu436PQKrSLvB5rGlUliLJZ24,41740
+signalwire_agents-1.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+signalwire_agents-1.0.16.dist-info/entry_points.txt,sha256=fMiBH-GLeXGaWWn58Mcj7KM_m3SdomQMUQu-1LTqscw,315
+signalwire_agents-1.0.16.dist-info/top_level.txt,sha256=kDGS6ZYv84K9P5Kyg9_S8P_pbUXoHkso0On_DB5bbWc,18
+signalwire_agents-1.0.16.dist-info/RECORD,,