agentic-fabriq-sdk 0.1.15__tar.gz → 0.1.16__tar.gz

{agentic_fabriq_sdk-0.1.15 → agentic_fabriq_sdk-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-fabriq-sdk
-Version: 0.1.15
+Version: 0.1.16
 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

{agentic_fabriq_sdk-0.1.15 → agentic_fabriq_sdk-0.1.16}/af_cli/commands/tools.py

@@ -224,30 +224,28 @@ 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' or 'oauth'"),
     
-    # API method fields
-    token: str = typer.Option(None, "--token", help="API token (for api method)"),
-    
-    # Credentials method fields
-    client_id: str = typer.Option(None, "--client-id", help="OAuth client ID (for credentials method)"),
-    client_secret: str = typer.Option(None, "--client-secret", help="OAuth client secret (for credentials method)"),
+    # 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)"),
+    client_id: str = typer.Option(None, "--client-id", help="OAuth client ID (for app-based auth like Google, Slack)"),
+    client_secret: str = typer.Option(None, "--client-secret", help="OAuth client secret (for app-based auth)"),
     redirect_uri: str = typer.Option(None, "--redirect-uri", help="OAuth redirect URI (optional, auto-generated)"),
 ):
     """
     Add a new tool connection with credentials.
     
     Examples:
-      # Notion (api method - single token)
-      afctl tools add notion --connection-id notion-work --method api --token "secret_abc123"
+      # Notion (api_credentials method - single token)
+      afctl tools add notion --connection-id notion-work --method api_credentials --token "secret_abc123"
       
-      # Google (credentials method - OAuth app)
-      afctl tools add google --connection-id google-work --method credentials \\
+      # Google (api_credentials method - OAuth app)
+      afctl tools add google_drive --connection-id google-work --method api_credentials \\
         --client-id "123.apps.googleusercontent.com" \\
         --client-secret "GOCSPX-abc123"
       
-      # Slack bot (api method)
-      afctl tools add slack --connection-id slack-bot --method api --token "xoxb-123..."
+      # Slack bot (api_credentials method - single token)
+      afctl tools add slack --connection-id slack-bot --method api_credentials --token "xoxb-123..."
     """
     try:
         from af_cli.core.config import get_config
@@ -276,23 +274,24 @@ 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", "oauth"]:
+                error("Method must be 'api_credentials' or 'oauth'")
                 raise typer.Exit(1)
             
-            # Validate API method requirements
-            if method == "api":
-                if not token:
-                    error("API method requires --token")
-                    info(f"Example: afctl tools add {tool} --connection-id {connection_id} --method api --token YOUR_TOKEN")
-                    raise typer.Exit(1)
-            
-            # Validate credentials method requirements
-            elif method == "credentials":
-                if not client_id or not client_secret:
-                    error("Credentials method requires --client-id and --client-secret")
-                    info(f"Example: afctl tools add {tool} --connection-id {connection_id} --method credentials \\")
-                    info(f"  --client-id YOUR_CLIENT_ID --client-secret YOUR_CLIENT_SECRET")
+            # Validate api_credentials method requirements
+            if method == "api_credentials":
+                # Must have either token OR (client_id + client_secret)
+                has_token = bool(token)
+                has_oauth_creds = bool(client_id and client_secret)
+                
+                if not has_token and not has_oauth_creds:
+                    error("api_credentials method requires either:")
+                    info("  • --token (for simple token auth like Notion, Slack bot)")
+                    info("  • --client-id and --client-secret (for OAuth app auth like Google)")
+                    info("")
+                    info(f"Examples:")
+                    info(f"  afctl tools add {tool} --connection-id {connection_id} --method api_credentials --token YOUR_TOKEN")
+                    info(f"  afctl tools add {tool} --connection-id {connection_id} --method api_credentials --client-id ID --client-secret SECRET")
                     raise typer.Exit(1)
             
             info(f"Creating connection: {connection_id}")
@@ -310,51 +309,59 @@ def add(
             client.post("/api/v1/user-connections", data=connection_data)
             success(f"✅ Connection entry created: {connection_id}")
             
-            # Step 2: Store credentials based on method
-            if method == "credentials" or method == "oauth":
+            # Step 2: Store credentials based on what was provided
+            if 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
                 
-                # Auto-generate redirect_uri if not provided
-                if not redirect_uri:
-                    config = get_config()
-                    redirect_uri = f"{config.gateway_url}/api/v1/tools/{api_tool_name}/oauth/callback"
-                    info(f"Using default redirect URI: {redirect_uri}")
-                
-                # Store OAuth app config
-                info("Storing OAuth app credentials...")
-                config_payload = {
-                    "client_id": client_id,
-                    "client_secret": client_secret,
-                }
-                if redirect_uri:
-                    config_payload["redirect_uri"] = redirect_uri
-                
-                client.post(
-                    f"/api/v1/tools/{api_tool_name}/config?connection_id={connection_id}",
-                    data=config_payload
-                )
-                success("✅ OAuth app credentials stored")
-                info("")
-                info(f"Next: Run 'afctl tools connect {connection_id}' to complete OAuth setup")
-                
-            elif method == "api":
-                # Store API token directly
-                info("Storing API credentials...")
-                
-                # Tool-specific endpoint and payload mappings
-                if tool == "notion":
-                    # Notion uses /config endpoint with integration_token field
-                    endpoint = f"/api/v1/tools/{tool}/config?connection_id={connection_id}"
-                    cred_payload = {"integration_token": token}
-                else:
-                    # Generic tools use /connection endpoint with api_token field
-                    endpoint = f"/api/v1/tools/{tool}/connection?connection_id={connection_id}"
-                    cred_payload = {"api_token": token}
-                
-                client.post(endpoint, data=cred_payload)
-                success("✅ API credentials stored")
-                success(f"✅ Connection '{connection_id}' is ready to use!")
+                if token:
+                    # Simple token-based auth (Notion, Slack bot, etc.)
+                    info("Storing API token...")
+                    
+                    # Tool-specific endpoint and payload mappings
+                    if tool == "notion":
+                        # Notion uses /config endpoint with integration_token field
+                        endpoint = f"/api/v1/tools/{tool}/config?connection_id={connection_id}"
+                        cred_payload = {"integration_token": token}
+                    else:
+                        # Generic tools use /connection endpoint with api_token field
+                        endpoint = f"/api/v1/tools/{tool}/connection?connection_id={connection_id}"
+                        cred_payload = {"api_token": token}
+                    
+                    client.post(endpoint, data=cred_payload)
+                    success("✅ API token stored")
+                    success(f"✅ Connection '{connection_id}' is ready to use!")
+                    
+                elif client_id and client_secret:
+                    # OAuth app credentials (Google, Slack app, etc.)
+                    # Auto-generate redirect_uri if not provided
+                    if not redirect_uri:
+                        config = get_config()
+                        redirect_uri = f"{config.gateway_url}/api/v1/tools/{api_tool_name}/oauth/callback"
+                        info(f"Using default redirect URI: {redirect_uri}")
+                    
+                    # Store OAuth app config
+                    info("Storing OAuth app credentials...")
+                    config_payload = {
+                        "client_id": client_id,
+                        "client_secret": client_secret,
+                    }
+                    if redirect_uri:
+                        config_payload["redirect_uri"] = redirect_uri
+                    
+                    client.post(
+                        f"/api/v1/tools/{api_tool_name}/config?connection_id={connection_id}",
+                        data=config_payload
+                    )
+                    success("✅ OAuth app credentials stored")
+                    info("")
+                    info(f"Next: Run 'afctl tools connect {connection_id}' to complete OAuth setup")
+            
+            elif method == "oauth":
+                # OAuth flow (legacy, redirect to api_credentials)
+                error("The 'oauth' method is deprecated. Please use 'api_credentials' instead.")
+                info("All credential storage now uses the 'api_credentials' method.")
+                raise typer.Exit(1)
             
             # Show helpful info
             info("")
@@ -394,14 +401,7 @@ def connect(
             tool = connection["tool"]
             method = connection["method"]
             
-            # Only credentials/oauth method needs OAuth completion
-            if method not in ["credentials", "oauth"]:
-                error(f"Connection '{connection_id}' uses '{method}' method")
-                info("Only 'credentials' or 'oauth' method connections need OAuth setup")
-                info("API connections are already connected after 'afctl tools add'")
-                raise typer.Exit(1)
-            
-            # Check if already connected
+            # Check if connection is already set up (has credentials stored)
             if connection.get("connected"):
                 warning(f"Connection '{connection_id}' is already connected")
                 confirm = typer.confirm("Do you want to reconnect (re-authorize)?")

{agentic_fabriq_sdk-0.1.15 → agentic_fabriq_sdk-0.1.16}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "agentic-fabriq-sdk"
-version = "0.1.15"
+version = "0.1.16"
 description = "Agentic Fabriq SDK: high-level client, CLI tool, DX helpers, and auth for AI agents"
 readme = "README.md"
 license = "Apache-2.0"