agentic-fabriq-sdk 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

af_cli/commands/applications.py

@@ -18,17 +18,21 @@ app = typer.Typer(help="Manage registered applications")
 console = Console()
 
 
-@app.command("create")
-def create_application(
+@app.command("register")
+def register_application(
     app_id: str = typer.Option(..., "--app-id", help="Application identifier (no spaces)"),
     connections: str = typer.Option(..., "--connections", help="Tool connections (format: 'tool1:conn-id,tool2:conn-id')"),
     scopes: Optional[str] = typer.Option(None, "--scopes", help="Scopes (format: 'scope1,scope2,scope3')"),
 ):
     """
-    Register a new application.
+    Step 1: Register a new application (returns activation token).
+    
+    This registers your application and returns a temporary activation token
+    that expires in 1 hour. Use this token with 'afctl applications connect'
+    to complete the setup and save credentials locally.
     
     Example:
-        afctl applications create \\
+        afctl applications register \\
             --app-id my-slack-bot \\
             --connections slack:my-slack-conn,github:my-github-conn \\
             --scopes slack:read,slack:write,github:repo:read
@@ -58,10 +62,10 @@ def create_application(
         for conn_id in tool_connections:
             tool_connections[conn_id] = scope_list
     
-    # Make API request
+    # Make API request to register (returns activation token)
     try:
         response = httpx.post(
-            f"{config.gateway_url}/api/v1/applications",
+            f"{config.gateway_url}/api/v1/applications/register",
             headers={"Authorization": f"Bearer {config.access_token}"},
             json={
                 "app_id": app_id,
@@ -83,6 +87,76 @@ def create_application(
         
         data = response.json()
         
+        # Display activation token
+        console.print("\n✅ Application registered successfully!", style="green bold")
+        console.print(f"\n📋 App ID: {data['app_id']}", style="cyan")
+        console.print(f"\n🔑 Activation Token:", style="yellow bold")
+        console.print(f"   {data['activation_token']}", style="yellow")
+        console.print(f"\n⏰ Token expires: {data['expires_at'][:19]} UTC", style="white")
+        console.print(f"   (Valid for 1 hour)", style="dim")
+        
+        console.print("\n📋 Next Steps:", style="cyan bold")
+        console.print(f"   1. Navigate to your project directory", style="white")
+        console.print(f"   2. Make sure you're authenticated: afctl auth login", style="white")
+        console.print(f"   3. Run the connect command:", style="white")
+        console.print(f"\n      afctl applications connect {app_id} --token <activation-token>", style="green")
+        console.print(f"\n⚠️  Save the activation token! It expires in 1 hour and can only be used once.", style="yellow bold")
+        
+    except httpx.HTTPError as e:
+        console.print(f"❌ Network error: {e}", style="red")
+        raise typer.Exit(1)
+
+
+@app.command("connect")
+def connect_application(
+    app_id: str = typer.Argument(..., help="Application identifier"),
+    token: str = typer.Option(..., "--token", help="Activation token from registration"),
+):
+    """
+    Step 2: Connect/activate an application (saves credentials locally).
+    
+    Uses the activation token from 'afctl applications register' to activate
+    the application and save credentials to the current directory.
+    
+    Example:
+        afctl applications connect my-slack-bot --token <activation-token>
+    """
+    config = get_config()
+    
+    if not config.is_authenticated():
+        console.print("❌ Not authenticated. Run 'afctl auth login' first.", style="red")
+        raise typer.Exit(1)
+    
+    # Make API request to activate (returns final credentials)
+    try:
+        response = httpx.post(
+            f"{config.gateway_url}/api/v1/applications/activate",
+            headers={"Authorization": f"Bearer {config.access_token}"},
+            json={"activation_token": token},
+            timeout=30.0
+        )
+        
+        if response.status_code == 404:
+            console.print("❌ Invalid or expired activation token", style="red")
+            console.print("   The token may have expired (valid for 1 hour) or was already used.", style="yellow")
+            console.print("   Register again with 'afctl applications register'", style="white")
+            raise typer.Exit(1)
+        elif response.status_code == 403:
+            console.print("❌ This activation token does not belong to you", style="red")
+            raise typer.Exit(1)
+        elif response.status_code != 201:
+            error_detail = response.text
+            try:
+                error_json = response.json()
+                error_detail = error_json.get("detail", response.text)
+            except:
+                pass
+            
+            console.print(f"❌ Failed to activate application: {error_detail}", style="red")
+            raise typer.Exit(1)
+        
+        data = response.json()
+        
         # Save credentials locally
         from af_sdk import save_application_config
         
@@ -99,7 +173,7 @@ def create_application(
         app_file = save_application_config(data["app_id"], app_config)
         
         # Display success
-        console.print("\n✅ Application registered successfully!", style="green bold")
+        console.print("\n✅ Application activated successfully!", style="green bold")
         console.print(f"\n📋 App ID: {data['app_id']}", style="cyan")
         console.print(f"🔑 Secret Key: {data['secret_key']}", style="yellow")
         console.print(f"\n💾 Credentials saved to: {app_file}", style="green")

af_cli/commands/tools.py

@@ -14,14 +14,86 @@ app = typer.Typer(help="Tool management commands")
 @app.command()
 def list(
     format: str = typer.Option("table", "--format", help="Output format"),
+    page: int = typer.Option(1, "--page", help="Page number (starts from 1)", min=1),
+    page_size: int = typer.Option(20, "--page-size", help="Number of items per page (1-100)", min=1, max=100),
+    search: str = typer.Option(None, "--search", help="Search query (searches tool IDs from registry like 'gmail', 'slack', and user connection names)"),
+    tool_filter: str = typer.Option(None, "--tool", help="Filter by tool type from registry (e.g., 'gmail' shows Gmail connections, 'google' shows all Google tools)"),
 ):
-    """List your tool connections (configured and connected tools)."""
+    """List your tool connections (configured and connected tools).
+
+    The command supports pagination and search to help you navigate large numbers
+    of connections efficiently.
+
+    Examples:
+      # List all connections (default: page 1, 20 per page)
+      afctl tools list
+
+      # List first page with 10 items per page
+      afctl tools list --page 1 --page-size 10
+
+      # Search for tool types (exact match against registry - shows all connections of that type)
+      afctl tools list --search gmail     # Shows all Gmail connections
+      afctl tools list --search google    # Shows all Google Workspace tools
+      afctl tools list --search slack     # Shows all Slack connections
+      afctl tools list --search notion    # Shows all Notion connections
+      afctl tools list --search github    # Shows all GitHub connections
+
+      # Filter by tool type (shows all connections of that tool)
+      afctl tools list --tool gmail       # Shows all Gmail connections
+      afctl tools list --tool google      # Shows all Google Workspace tools
+      afctl tools list --tool slack       # Shows all Slack connections
+
+      # Search and paginate together
+      afctl tools list --search google --page 1 --page-size 5
+
+      # Find connections by name (fallback search)
+      afctl tools list --search work      # Connections with "work" in name
+      afctl tools list --search personal # Connections with "personal" in name
+
+      # Combined search and filtering (AND logic - must match both)
+      afctl tools list --tool google --search gmail     # Google tools containing "gmail"
+      afctl tools list --search drive --tool google     # Google tools with "drive"
+      afctl tools list --search team --tool slack       # Slack connections with "team"
+
+    Pagination:
+      - Pages start from 1
+      - Page size range: 1-100 items
+      - Shows helpful tips when more results are available
+
+    Search:
+      - **Primary**: Searches available tool IDs from registry (e.g., "gmail" matches "gmail", "google" matches "google_drive")
+      - **Secondary**: Searches user connection IDs and display names (e.g., "gmail" matches "gmail_work")
+      - Case-insensitive matching
+      - Shows all connections matching the search criteria
+
+    Tool Filtering:
+      - Filters by tool type from connector registry
+      - Shows all user connections for that tool type
+      - "google" shows all Google Workspace tools (Drive, Docs, Sheets, Gmail, etc.)
+      - "gmail" shows only Gmail connections
+      - "slack" shows only Slack connections
+      - Combines with search and pagination
+    """
     try:
         with get_client() as client:
-            connections = client.get("/api/v1/user-connections")
-            
+            # Build query parameters
+            params = {}
+            if page != 1:
+                params["page"] = page
+            if page_size != 20:
+                params["page_size"] = page_size
+            if search:
+                params["search"] = search
+            if tool_filter:
+                params["tool_filter"] = tool_filter
+
+            connections = client.get("/api/v1/user-connections", params=params)
+
             if not connections:
-                warning("No tool connections found. Add connections in the dashboard UI.")
+                if search or tool_filter:
+                    warning(f"No tool connections found matching your criteria. Try adjusting your search or filter.")
+                else:
+                    warning("No tool connections found. Add connections in the dashboard UI.")
                 return
             
             # Format for better display
@@ -42,11 +114,27 @@ def list(
                     "Added": conn.get("created_at", "N/A")[:10] if conn.get("created_at") else "N/A",
                 })
             
+            # Show pagination info if not on first page or if filters applied
+            total_info = ""
+            if page != 1 or page_size != 20 or search or tool_filter:
+                total_info = f" (Page {page}, {len(connections)} shown"
+                if search:
+                    total_info += f", Search: '{search}'"
+                if tool_filter:
+                    total_info += f", Tool: '{tool_filter}'"
+                total_info += ")"
+
             print_output(
                 display_data,
                 format_type=format,
-                title="Your Tool Connections"
+                title=f"Your Tool Connections{total_info}"
             )
+
+            # Show helpful tips for pagination
+            if len(connections) == page_size:
+                info(f"💡 Tip: Use --page {page + 1} to see more results, or --page-size to adjust items per page")
+            if search or tool_filter:
+                info(f"💡 Tip: Use --search or --tool filters to find specific connections")
             
     except Exception as e:
         error(f"Failed to list tool connections: {e}")
@@ -197,7 +285,7 @@ def add(
     tool: str = typer.Argument(..., help="Tool name (google_drive, google_slides, slack, notion, github, etc.)"),
     connection_id: str = typer.Option(..., "--connection-id", help="Unique connection ID"),
     display_name: str = typer.Option(None, "--display-name", help="Human-readable name"),
-    method: str = typer.Option(..., "--method", help="Connection method: 'api_credentials' or 'oauth'"),
+    method: str = typer.Option(..., "--method", help="Connection method: 'api_credentials', 'oauth3' (Google platform OAuth), or 'oauth'"),
     
     # API credentials method fields (can be either a token OR client_id/secret)
     token: str = typer.Option(None, "--token", help="API token (for simple token-based auth like Notion, Slack bot)"),
@@ -212,7 +300,16 @@ def add(
       # Notion (api_credentials method - single token)
       afctl tools add notion --connection-id notion-work --method api_credentials --token "secret_abc123"
       
-      # Google (api_credentials method - OAuth app)
+      # Google (oauth3 method - uses platform OAuth, no credentials needed)
+      afctl tools add google_drive --connection-id google-work --method oauth3
+      
+      # Slack (oauth3 method - uses platform OAuth, no credentials needed)
+      afctl tools add slack --connection-id slack-work --method oauth3
+      
+      # Notion (oauth3 method - uses platform OAuth, no credentials needed)
+      afctl tools add notion --connection-id notion-work --method oauth3
+      
+      # Google (api_credentials method - your own OAuth app)
       afctl tools add google_drive --connection-id google-work --method api_credentials \\
         --client-id "123.apps.googleusercontent.com" \\
         --client-secret "GOCSPX-abc123"
@@ -247,10 +344,17 @@ def add(
                 raise typer.Exit(1)
             
             # Validate method
-            if method not in ["api_credentials", "oauth"]:
-                error("Method must be 'api_credentials' or 'oauth'")
+            if method not in ["api_credentials", "oauth3", "oauth"]:
+                error("Method must be 'api_credentials', 'oauth3', or 'oauth'")
                 raise typer.Exit(1)
             
+            # Validate oauth3 method is only for Google, Slack, and Notion tools
+            if method == "oauth3":
+                if not (tool.startswith("google_") or tool == "gmail" or tool == "slack" or tool == "notion"):
+                    error("oauth3 method is only available for Google Workspace tools, Slack, and Notion")
+                    info("For other tools, use 'api_credentials' method")
+                    raise typer.Exit(1)
+            
             # Validate api_credentials method requirements
             if method == "api_credentials":
                 # Must have either token OR (client_id + client_secret)
@@ -282,8 +386,14 @@ def add(
             client.post("/api/v1/user-connections", data=connection_data)
             success(f"✅ Connection entry created: {connection_id}")
             
-            # Step 2: Store credentials based on what was provided
-            if method == "api_credentials":
+            # Step 2: Store credentials based on method
+            if method == "oauth3":
+                # OAuth3 uses platform credentials - no need to store user credentials
+                success("✅ Connection configured with platform OAuth")
+                info("")
+                info(f"Next: Run 'afctl tools connect {connection_id}' to authenticate")
+            
+            elif method == "api_credentials":
                 # Determine the API base tool name (Google tools all use "google")
                 api_tool_name = "google" if (tool.startswith("google_") or tool == "gmail") else tool
                 
@@ -384,17 +494,27 @@ def connect(
                 if not confirm:
                     return
             
-            # Determine the API base tool name (Google tools all use "google")
-            api_tool_name = "google" if (tool.startswith("google_") or tool == "gmail") else tool
+            # Determine the API base tool name
+            # - Google tools all use "google" for API credentials, "google_oauth" for oauth3
+            # - Notion uses "notion" for API credentials, "notion_oauth" for oauth3
+            if tool.startswith("google_") or tool == "gmail":
+                api_tool_name = "google_oauth" if method == "oauth3" else "google"
+            elif tool == "notion":
+                api_tool_name = "notion_oauth" if method == "oauth3" else "notion"
+            else:
+                api_tool_name = tool
             
             # Initiate OAuth flow
             info(f"Initiating OAuth for {tool}...")
             
             # For Google tools, pass the specific tool_type parameter
-            tool_type_param = f"&tool_type={tool}" if tool != api_tool_name else ""
+            tool_type_param = f"&tool_type={tool}" if (tool.startswith("google_") or tool == "gmail") else ""
+            
+            # For oauth3 method, pass the method parameter to use platform credentials
+            method_param = f"&method={method}" if method == "oauth3" else ""
             
             result = client.post(
-                f"/api/v1/tools/{api_tool_name}/connect/initiate?connection_id={connection_id}{tool_type_param}",
+                f"/api/v1/tools/{api_tool_name}/connect/initiate?connection_id={connection_id}{tool_type_param}{method_param}",
                 data={}
             )
             

af_sdk/auth/oauth.py

@@ -47,6 +47,9 @@ def oauth_required(*, scopes: List[str], refresh_if_expired: bool = True):
                     refresh_if_expired=refresh_if_expired,
                 )
 
+                # Log token info (first 20 chars for debugging)
+                ctx.logger.info(f"OAuth decorator injecting token for {tool_id}: {token[:20]}...")
+
                 # Inject Authorization header
                 headers = kwargs.setdefault("headers", {})
                 headers.setdefault("Authorization", f"Bearer {token}")

af_sdk/connectors/base.py

@@ -204,10 +204,18 @@ class HTTPConnectorMixin:
         url = f"{self.base_url.rstrip('/')}/{path.lstrip('/')}"
         request_headers = {**self.default_headers, **(headers or {})}
 
+        # Log request details for debugging
+        auth_header = request_headers.get("Authorization", "")
+        auth_preview = f"{auth_header[:30]}..." if auth_header else "None"
+        self.logger.info(f"[HTTP Request] {method} {url}")
+        self.logger.info(f"[HTTP Request] Authorization: {auth_preview}")
+        self.logger.info(f"[HTTP Request] Headers: {list(request_headers.keys())}")
+
         try:
             response = await self.session.request(
                 method, url, headers=request_headers, **kwargs
             )
+            self.logger.info(f"[HTTP Response] Status: {response.status_code}")
             response.raise_for_status()
             return response
         except httpx.HTTPError as e:

{agentic_fabriq_sdk-0.1.22.dist-info → agentic_fabriq_sdk-0.1.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-fabriq-sdk
-Version: 0.1.22
+Version: 0.1.24
 Summary: Agentic Fabriq SDK: high-level client, CLI tool, DX helpers, and auth for AI agents
 License: Apache-2.0
 Keywords: fabriq,agentic-fabriq,sdk,ai,agents,agentic,fabric,cli
@@ -88,15 +88,34 @@ async def main():
         tools = await af.list_tools()
         agents = await af.list_agents()
         
-        # Invoke tools using connection ID
+        # Invoke Slack tools
         result = await af.invoke_connection("my-slack", method="get_channels")
         
-        # Or post a message
+        # Post a Slack message
         await af.invoke_connection(
             "my-slack",
             method="post_message",
             parameters={"channel": "test", "text": "Hello from SDK!"}
         )
+        
+        # Get Gmail emails
+        result = await af.invoke_connection(
+            "gmail_work",
+            method="get_emails",
+            parameters={"max_results": 10, "q": "is:unread"}
+        )
+        emails = result.get("emails", [])
+        
+        # Send an email
+        await af.invoke_connection(
+            "gmail_work",
+            method="send_email",
+            parameters={
+                "to": "recipient@example.com",
+                "subject": "Hello from SDK",
+                "body": "This email was sent via Agentic Fabric SDK!"
+            }
+        )
 ```
 
 DX orchestration:

{agentic_fabriq_sdk-0.1.22.dist-info → agentic_fabriq_sdk-0.1.24.dist-info}/RECORD

@@ -1,11 +1,11 @@
 af_cli/__init__.py,sha256=F2T4x4H3VIdmTjHRyV5DkaRvbZcdHYzAWD2hxtTplE4,188
 af_cli/commands/__init__.py,sha256=Qngm2Yks6oTKazlxCZA_tIAHXwHoU6Oc7Pw5BGkA7W4,49
-af_cli/commands/applications.py,sha256=o6P-rJHO3tdqOQTBksntlVO7Y6hoDSPQp_9nB1azwzc,11958
+af_cli/commands/applications.py,sha256=gw5wY2_cTlhvgnoeuUerviwtyb0WXU3mVL28eV_WGhQ,15496
 af_cli/commands/auth.py,sha256=gz7DLiTTV0nv2DnKaa7_9nLHevCWslG54rRKRA1alx0,11967
 af_cli/commands/config.py,sha256=_k4ixGZfa7Yl_yUL-W1jeMQzykFcPcbw20Yr1v6_ShM,2748
 af_cli/commands/mcp_servers.py,sha256=1hEb4tX80dYb-j_2Z3gDud_v1FcMxl83syJ2N2eLWzI,2390
 af_cli/commands/secrets.py,sha256=z_rHfn8-KEonTC5dioBgH7sc1ppMOltFVFz-58Nqwa0,3436
-af_cli/commands/tools.py,sha256=2D8b6WwgKflk6JOoRxi-1j9k08mwLNeKlaUU8eOqPxs,24525
+af_cli/commands/tools.py,sha256=CRtxGzMfm9etq9SLrC3v_MvBNIh3Myw4xblv5aMVTL0,30828
 af_cli/core/__init__.py,sha256=cQ0H7rGfaMISQPhoNe4Xfu_EKU2TqRVt2OMI7tPea5U,51
 af_cli/core/client.py,sha256=AYNWdCMNtDx7LOGXwoS7_rruss479T0lD6PZ1hG5dMA,5082
 af_cli/core/config.py,sha256=fwLUF0blNII2RKdFlJ3Hat51vwwNyxpIkU_HvViz8To,8538
@@ -17,10 +17,10 @@ af_sdk/__init__.py,sha256=uKLl3Sqlg_TgmGZtI0Tt14JNXIhdHSb6dplw6acBDvU,1569
 af_sdk/auth/__init__.py,sha256=laIiIwgxy0mEgRoXEakoEs7BuUYnyrlzHJbdf8Sqa5E,1137
 af_sdk/auth/applications.py,sha256=Tc5j47S5WWGFPOhsjEI40SZuCd5ynzzAohy1NS0DyAM,7474
 af_sdk/auth/dpop.py,sha256=s0uiyxxuzsVQNtSexji1htJoxrALwlf1P9507xa-M3Y,1285
-af_sdk/auth/oauth.py,sha256=WRTrrBzs9ieiNnWfxagP6Ag4oI9k0soYjEkjfS2y5Lg,8120
+af_sdk/auth/oauth.py,sha256=iAXrOYRTWUqo2eEzX_gRmzHZRTzdo3DrZwxOeYFAZ28,8284
 af_sdk/auth/token_cache.py,sha256=X36E6K0lWqMAqlJXC3i343y8oy-uFm1q-FEdVKXdL1Y,11300
 af_sdk/connectors/__init__.py,sha256=8SDknAjPH5Swk3fJZRh6Mi19zDZQO7vcej3BzOdHGCc,411
-af_sdk/connectors/base.py,sha256=m3NtB4ozPtfjjs6t91OCLjCsj1xtzyK7jc7ox-HooPg,7319
+af_sdk/connectors/base.py,sha256=Y0gBw9o0botNmi_hNiVgvoevnJei_XWOO7IE0v0gGDE,7799
 af_sdk/connectors/registry.py,sha256=ZH0wYIZBqDnTWJ_IhfwZzifO5r3Rkb0VlEyXDhrGWIY,8799
 af_sdk/dx/__init__.py,sha256=oiLKoDKu8I62hGj3AKzvZu8WlZbGHb_80qlmxkVWc-k,130
 af_sdk/dx/decorators.py,sha256=o_EmvE_8pp2vTgMJMgfTy5SXG_24yabuKdoytah02Hk,1294
@@ -35,7 +35,7 @@ af_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 af_sdk/transport/__init__.py,sha256=HsOc6MmlxIS-PSYC_-6E36-dZYyT_auZeoXvGzVAqeg,104
 af_sdk/transport/http.py,sha256=QB3eqQbwug95QHf5PG_714NKtlTjV9PzVTo8izJCylc,13203
 af_sdk/vault.py,sha256=QVNGigIw8ND5sVXt05gvUY222b5-i9EbzLWNsDGdOU4,17926
-agentic_fabriq_sdk-0.1.22.dist-info/METADATA,sha256=rZ0O5voq0PTXDLRAFCEBmjE9ynQKIZXaMJTmgvGJfII,3678
-agentic_fabriq_sdk-0.1.22.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-agentic_fabriq_sdk-0.1.22.dist-info/entry_points.txt,sha256=XUO2EaJhUtUS5pwVIkhemC-nEeFbKgXXLW97gQCCGm8,41
-agentic_fabriq_sdk-0.1.22.dist-info/RECORD,,
+agentic_fabriq_sdk-0.1.24.dist-info/METADATA,sha256=47ZTjyyssrBYglw22NuRaQwXB89SsdJHEm1r6yfycAU,4259
+agentic_fabriq_sdk-0.1.24.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+agentic_fabriq_sdk-0.1.24.dist-info/entry_points.txt,sha256=XUO2EaJhUtUS5pwVIkhemC-nEeFbKgXXLW97gQCCGm8,41
+agentic_fabriq_sdk-0.1.24.dist-info/RECORD,,