agentic-fabriq-sdk 0.1.21__py3-none-any.whl → 0.1.23__py3-none-any.whl

af_cli/commands/tools.py

@@ -197,7 +197,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 +212,10 @@ 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
+      
+      # 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 +250,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 tools
+            if method == "oauth3":
+                if not (tool.startswith("google_") or tool == "gmail"):
+                    error("oauth3 method is only available for Google Workspace tools")
+                    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 +292,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 with your Google account")
+            
+            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
                 
@@ -393,8 +409,11 @@ def connect(
             # For Google tools, pass the specific tool_type parameter
             tool_type_param = f"&tool_type={tool}" if tool != api_tool_name 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/applications.py

@@ -51,7 +51,7 @@ async def get_application_client(
     
     Example:
         >>> client = await get_application_client("my-slack-bot")
-        >>> result = await client.invoke_tool("slack-uuid", "post_message", {...})
+        >>> result = await client.invoke_connection("my-slack", method="post_message", parameters={...})
     """
     # 1. Load application config
     try:

af_sdk/fabriq_client.py

@@ -78,85 +78,6 @@ class FabriqClient:
         r = await self._http.get("/tools", params=params, headers=self._extra_headers)
         return r.json()
 
-    async def invoke_tool(
-        self,
-        tool_identifier: str,
-        *,
-        method: str,
-        parameters: Optional[Dict[str, Any]] = None,
-        context: Optional[Dict[str, Any]] = None,
-        connection_id: Optional[str] = None,
-    ) -> Dict[str, Any]:
-        """Invoke a tool by name or UUID.
-        
-        Args:
-            tool_identifier: Tool name (e.g., 'slack') or UUID
-            method: Method name to invoke
-            parameters: Method parameters
-            context: Additional context
-            connection_id: Specific connection ID to use (for multi-connection tools)
-            
-        Returns:
-            Tool invocation result
-            
-        Examples:
-            result = await client.invoke_tool("slack", method="get_channels")
-            result = await client.invoke_tool("slack", method="post_message", 
-                                             parameters={"channel": "test", "text": "Hello!"})
-            result = await client.invoke_tool("slack", method="get_channels",
-                                             connection_id="slacker")
-        """
-        # Try to resolve tool name to UUID if not already a UUID
-        tool_id = tool_identifier
-        try:
-            from uuid import UUID
-            UUID(tool_identifier)
-            # It's already a UUID, use it directly
-        except ValueError:
-            # Not a UUID, try to look up by name
-            try:
-                tools_response = await self.list_tools()
-            except Exception as e:
-                raise ValueError(f"Failed to list tools for name resolution: {e}. Please use UUID directly.")
-            
-            # Handle different response formats
-            if isinstance(tools_response, dict) and "tools" in tools_response:
-                tools = tools_response["tools"]
-            elif isinstance(tools_response, dict) and "items" in tools_response:
-                tools = tools_response["items"]
-            elif hasattr(tools_response, '__iter__') and not isinstance(tools_response, (str, dict)):
-                tools = list(tools_response)
-            else:
-                tools = []
-            
-            # Find tool by name (case-insensitive)
-            matching_tools = [t for t in tools if isinstance(t, dict) and t.get("name", "").lower() == tool_identifier.lower()]
-            
-            if not matching_tools:
-                available = [t.get('name') for t in tools if isinstance(t, dict) and t.get('name')]
-                raise ValueError(f"Tool '{tool_identifier}' not found. Available tools: {available}")
-            
-            if len(matching_tools) > 1:
-                raise ValueError(f"Multiple tools found with name '{tool_identifier}'. Please use UUID instead.")
-            
-            tool_id = matching_tools[0].get("id")
-            if not tool_id:
-                raise ValueError(f"Tool '{tool_identifier}' found but has no ID")
-        
-        body = {"method": method}
-        if parameters is not None:
-            body["parameters"] = parameters
-        
-        # Add connection_id to context if provided
-        if context is not None or connection_id is not None:
-            ctx = (context or {}).copy()
-            if connection_id is not None:
-                ctx["connection_id"] = connection_id
-            body["context"] = ctx
-        
-        r = await self._http.post(f"/tools/{tool_id}/invoke", json=body, headers=self._extra_headers)
-        return r.json()
-    
     async def invoke_connection(
         self,
         connection_id: str,

{agentic_fabriq_sdk-0.1.21.dist-info → agentic_fabriq_sdk-0.1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-fabriq-sdk
-Version: 0.1.21
+Version: 0.1.23
 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,12 +88,12 @@ async def main():
         tools = await af.list_tools()
         agents = await af.list_agents()
         
-        # Invoke tools by name (easier!)
-        result = await af.invoke_tool("slack", method="get_channels")
+        # Invoke tools using connection ID
+        result = await af.invoke_connection("my-slack", method="get_channels")
         
         # Or post a message
-        await af.invoke_tool(
-            "slack",
+        await af.invoke_connection(
+            "my-slack",
             method="post_message",
             parameters={"channel": "test", "text": "Hello from SDK!"}
         )

{agentic_fabriq_sdk-0.1.21.dist-info → agentic_fabriq_sdk-0.1.23.dist-info}/RECORD

@@ -5,7 +5,7 @@ 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=2ulB-UMvjNujHOpu2GowLivEFvUq41ftDj04QUUd8H0,25665
 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
@@ -15,7 +15,7 @@ af_cli/core/token_storage.py,sha256=WhOQLx5_9pn2lAlFX01Y5DmWO7B9BJYfEkASCsBQwaI,
 af_cli/main.py,sha256=zFbbUhgmpGRp9VBGOyzSIK4NlguGsBI_SqZchyOu5Xc,5100
 af_sdk/__init__.py,sha256=uKLl3Sqlg_TgmGZtI0Tt14JNXIhdHSb6dplw6acBDvU,1569
 af_sdk/auth/__init__.py,sha256=laIiIwgxy0mEgRoXEakoEs7BuUYnyrlzHJbdf8Sqa5E,1137
-af_sdk/auth/applications.py,sha256=tJ4UMvCJF73i55_4uqsBM04GxDHk5X0SQRWdHVJDcNM,7452
+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/token_cache.py,sha256=X36E6K0lWqMAqlJXC3i343y8oy-uFm1q-FEdVKXdL1Y,11300
@@ -27,7 +27,7 @@ af_sdk/dx/decorators.py,sha256=o_EmvE_8pp2vTgMJMgfTy5SXG_24yabuKdoytah02Hk,1294
 af_sdk/dx/runtime.py,sha256=5oowtdWtTr12odBz6pXKexSVKf2smfQDw71-jBDKr8A,2471
 af_sdk/events.py,sha256=onz1wWwATpm71HFfcEJLhvXBDSmE0M9RC92lMS-Sd3k,22609
 af_sdk/exceptions.py,sha256=ZVjjBeq17CGK69N2OTkVTjPXqXSI_gA7cZk9rCvARcI,4381
-af_sdk/fabriq_client.py,sha256=28N7EdrwbF7KQLlAZd71J_fMm3tpBOykOjOJYgVfLtc,11068
+af_sdk/fabriq_client.py,sha256=lDrMl1tx0mRzBjQte_loVosOadWOgREy_2iVVv0x2ko,7576
 af_sdk/models/__init__.py,sha256=nSjgNEyYILZ6WIQF-oG5IT0CWV7JGuE0xNLw8sHPshM,707
 af_sdk/models/audit.py,sha256=_wRahNV7M7ftc2AHFf7J3WzIJ5cUyZhFn_lZX9NITp8,1476
 af_sdk/models/types.py,sha256=DPrl7XuFSYRrc8el8OX-ZNcZrIZwl8rTR9cH01uZFaU,5106
@@ -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.21.dist-info/METADATA,sha256=AuB5Bzkt-Wr_qpH3UC38whJ0LYI0axMQ_e00IXqCc2A,3658
-agentic_fabriq_sdk-0.1.21.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-agentic_fabriq_sdk-0.1.21.dist-info/entry_points.txt,sha256=XUO2EaJhUtUS5pwVIkhemC-nEeFbKgXXLW97gQCCGm8,41
-agentic_fabriq_sdk-0.1.21.dist-info/RECORD,,
+agentic_fabriq_sdk-0.1.23.dist-info/METADATA,sha256=2pgcbX9ATNcVI6f6i_OziKFUTpK_ypzwyFlC0fct2-c,3678
+agentic_fabriq_sdk-0.1.23.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+agentic_fabriq_sdk-0.1.23.dist-info/entry_points.txt,sha256=XUO2EaJhUtUS5pwVIkhemC-nEeFbKgXXLW97gQCCGm8,41
+agentic_fabriq_sdk-0.1.23.dist-info/RECORD,,