agentic-fabriq-sdk 0.1.7__tar.gz → 0.1.9__tar.gz

{agentic_fabriq_sdk-0.1.7 → agentic_fabriq_sdk-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-fabriq-sdk
-Version: 0.1.7
+Version: 0.1.9
 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
@@ -16,16 +16,17 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Typing :: Typed
 Requires-Dist: PyJWT (>=2.8.0)
 Requires-Dist: aiohttp (>=3.9.0)
-Requires-Dist: httpx (>=0.25)
+Requires-Dist: click (>=8.0.0)
+Requires-Dist: httpx (>=0.25.0)
 Requires-Dist: keyring (>=25.0.0)
 Requires-Dist: nats-py (>=2.4.0)
 Requires-Dist: opentelemetry-api (>=1.20.0)
 Requires-Dist: opentelemetry-instrumentation-httpx (>=0.41b0)
-Requires-Dist: pydantic (>=2.4)
+Requires-Dist: pydantic (>=2.4.0)
 Requires-Dist: rich (>=13.7.0)
 Requires-Dist: stevedore (>=5.1.0)
-Requires-Dist: typer (>=0.9.0)
-Requires-Dist: typing-extensions
+Requires-Dist: typer[all] (>=0.9.0)
+Requires-Dist: typing-extensions (>=4.0.0)
 Project-URL: Documentation, https://docs.agentic-fabric.org
 Project-URL: Homepage, https://github.com/agentic-fabric/agentic-fabric
 Project-URL: Repository, https://github.com/agentic-fabric/agentic-fabric

{agentic_fabriq_sdk-0.1.7 → agentic_fabriq_sdk-0.1.9}/af_cli/commands/tools.py

@@ -147,10 +147,10 @@ def invoke(
 
 @app.command()
 def add(
-    tool: str = typer.Argument(..., help="Tool name (google, slack, notion, github, etc.)"),
+    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' or 'credentials'"),
+    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)"),
@@ -179,9 +179,31 @@ def add(
         from af_cli.core.config import get_config
         
         with get_client() as client:
+            # Validate tool name - check for common mistakes
+            if tool.lower() == "google":
+                error("❌ Invalid tool name: 'google'")
+                info("")
+                info("Please specify the exact Google Workspace tool:")
+                info("  • google_drive    - Google Drive")
+                info("  • google_docs     - Google Docs")
+                info("  • google_sheets   - Google Sheets")
+                info("  • google_slides   - Google Slides")
+                info("  • gmail           - Gmail")
+                info("  • google_calendar - Google Calendar")
+                info("  • google_meet     - Google Meet")
+                info("  • google_forms    - Google Forms")
+                info("  • google_classroom - Google Classroom")
+                info("  • google_people   - Google People (Contacts)")
+                info("  • google_chat     - Google Chat")
+                info("  • google_tasks    - Google Tasks")
+                info("")
+                info("Example:")
+                info(f"  afctl tools add google_drive --connection-id {connection_id} --method {method}")
+                raise typer.Exit(1)
+            
             # Validate method
-            if method not in ["api", "credentials"]:
-                error("Method must be 'api' or 'credentials'")
+            if method not in ["api", "credentials", "oauth"]:
+                error("Method must be 'api', 'credentials', or 'oauth'")
                 raise typer.Exit(1)
             
             # Validate API method requirements
@@ -215,11 +237,14 @@ def add(
             success(f"✅ Connection entry created: {connection_id}")
             
             # Step 2: Store credentials based on method
-            if method == "credentials":
+            if method == "credentials" or method == "oauth":
+                # 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/{tool}/oauth/callback"
+                    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
@@ -232,7 +257,7 @@ def add(
                     config_payload["redirect_uri"] = redirect_uri
                 
                 client.post(
-                    f"/api/v1/tools/{tool}/config?connection_id={connection_id}",
+                    f"/api/v1/tools/{api_tool_name}/config?connection_id={connection_id}",
                     data=config_payload
                 )
                 success("✅ OAuth app credentials stored")
@@ -295,10 +320,10 @@ def connect(
             tool = connection["tool"]
             method = connection["method"]
             
-            # Only credentials method needs OAuth completion
-            if method != "credentials":
+            # Only credentials/oauth method needs OAuth completion
+            if method not in ["credentials", "oauth"]:
                 error(f"Connection '{connection_id}' uses '{method}' method")
-                info("Only 'credentials' method connections need OAuth setup")
+                info("Only 'credentials' or 'oauth' method connections need OAuth setup")
                 info("API connections are already connected after 'afctl tools add'")
                 raise typer.Exit(1)
             
@@ -309,11 +334,17 @@ 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
+            
             # 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 ""
+            
             result = client.post(
-                f"/api/v1/tools/{tool}/connect/initiate?connection_id={connection_id}",
+                f"/api/v1/tools/{api_tool_name}/connect/initiate?connection_id={connection_id}{tool_type_param}",
                 data={}
             )
             

{agentic_fabriq_sdk-0.1.7 → agentic_fabriq_sdk-0.1.9}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "agentic-fabriq-sdk"
-version = "0.1.7"
+version = "0.1.9"
 description = "Agentic Fabriq SDK: high-level client, CLI tool, DX helpers, and auth for AI agents"
 readme = "README.md"
 license = "Apache-2.0"
@@ -28,19 +28,25 @@ include = ["af_sdk/py.typed"]
 
 [tool.poetry.dependencies]
 python = ">=3.11,<3.13"
-httpx = ">=0.25"
-pydantic = ">=2.4"
-typing-extensions = "*"
-stevedore = ">=5.1.0"
+# Core SDK dependencies
+httpx = ">=0.25.0"
+pydantic = ">=2.4.0"
+typing-extensions = ">=4.0.0"
 PyJWT = ">=2.8.0"
+# OpenTelemetry for tracing
 opentelemetry-api = ">=1.20.0"
 opentelemetry-instrumentation-httpx = ">=0.41b0"
+# NATS for event streaming
 nats-py = ">=2.4.0"
+# Additional HTTP client support
 aiohttp = ">=3.9.0"
+# Plugin/extension system
+stevedore = ">=5.1.0"
 # CLI dependencies
-typer = ">=0.9.0"
+typer = {extras = ["all"], version = ">=0.9.0"}
 rich = ">=13.7.0"
 keyring = ">=25.0.0"
+click = ">=8.0.0"
 
 [tool.poetry.scripts]
 afctl = "af_cli.main:app"