optimizely-opal.opal-tools-sdk 0.1.1.dev0__py3-none-any.whl → 0.1.3.dev0__py3-none-any.whl

opal_tools_sdk/decorators.py

@@ -1,7 +1,7 @@
 import inspect
 import re
 import logging
-from typing import Callable, Any, List, Dict, Type, get_type_hints, Optional, Union
+from typing import Callable, Any, List, Dict, Type, get_origin, get_type_hints, Optional, Union
 from fastapi import APIRouter, Depends, Header, HTTPException
 from pydantic import BaseModel
 
@@ -69,13 +69,17 @@ def tool(name: str, description: str, auth_requirements: Optional[List[Dict[str,
                     param_type = ParameterType.number
                 elif field_type == bool:
                     param_type = ParameterType.boolean
-                elif field_type == list or field_type == List:
+                elif get_origin(field_type) is list:
                     param_type = ParameterType.list
-                elif field_type == dict or field_type == Dict:
+                elif get_origin(field_type) is dict:
                     param_type = ParameterType.dictionary
 
                 # Determine if required
-                required = field_info.default is ... if hasattr(field_info, 'default') else True
+                field_info_extra = getattr(field_info, "json_schema_extra") or {}
+                if "required" in field_info_extra:
+                    required = field_info_extra["required"]
+                else:
+                    required = field_info.default is ... if hasattr(field_info, 'default') else True
 
                 # Get description
                 description_text = ""

opal_tools_sdk/models.py

@@ -8,7 +8,7 @@ class ParameterType(str, Enum):
     integer = "integer"
     number = "number"
     boolean = "boolean"
-    list = "list"  # Changed to match main service expectation
+    list = "array"  # Changed to match main service expectation
     dictionary = "object"  # Standard JSON schema type
 
 @dataclass
@@ -18,7 +18,7 @@ class Parameter:
     param_type: ParameterType
     description: str
     required: bool
-    
+
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary for the discovery endpoint."""
         return {
@@ -34,7 +34,7 @@ class AuthRequirement:
     provider: str  # e.g., "google", "microsoft"
     scope_bundle: str  # e.g., "calendar", "drive"
     required: bool = True
-    
+
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary for the discovery endpoint."""
         return {
@@ -52,7 +52,7 @@ class Function:
     endpoint: str
     auth_requirements: Optional[List[AuthRequirement]] = None
     http_method: str = "POST"
-    
+
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary for the discovery endpoint."""
         result = {
@@ -62,8 +62,8 @@ class Function:
             "endpoint": self.endpoint,
             "http_method": self.http_method
         }
-        
+
         if self.auth_requirements:
             result["auth_requirements"] = [auth.to_dict() for auth in self.auth_requirements]
-            
+
         return result

opal_tools_sdk/service.py

@@ -132,6 +132,11 @@ class ToolsService:
                 if auth_data:
                     print(f"Auth data provided for provider: {auth_data.get('provider', 'unknown')}")
 
+                # Extract environment data if available
+                environment = body.get("environment", {})
+                if environment:
+                    print(f"Environment data provided: {environment}")
+
                 print(f"Extracted parameters: {params}")
 
                 # Get the parameter model from handler's signature
@@ -139,24 +144,27 @@ class ToolsService:
                 param_name = list(sig.parameters.keys())[0]
                 param_type = get_type_hints(handler).get(param_name)
 
-                # Check signature to see if it accepts auth data
-                accepts_auth = len(sig.parameters) > 1
 
+                args = []
+                kwargs = {}
                 if param_type:
                     # Create instance of param model
                     model_instance = param_type(**params)
-                    if accepts_auth:
-                        # Call with auth data if the handler accepts it
-                        result = await handler(model_instance, auth_data)
-                    else:
-                        # Call without auth data
-                        result = await handler(model_instance)
+                    args.append(model_instance)
                 else:
                     # Fall back if type hints not available
-                    if accepts_auth:
-                        result = await handler(BaseModel(**params), auth_data)
-                    else:
-                        result = await handler(BaseModel(**params))
+                    args.append(BaseModel(**params))
+
+                # Check signature to see if it accepts other values
+
+                # TODO: Change this to "auth"
+                if auth_param := sig.parameters.get("auth_data"):
+                    kwargs[auth_param.name] = auth_data
+
+                if environment_param := sig.parameters.get("environment"):
+                    kwargs[environment_param.name] = environment
+
+                result = await handler(*args, **kwargs)
 
                 print(f"Tool {name} returned: {result}")
                 return result

{optimizely_opal_opal_tools_sdk-0.1.1.dev0.dist-info → optimizely_opal_opal_tools_sdk-0.1.3.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optimizely-opal.opal-tools-sdk
-Version: 0.1.1.dev0
+Version: 0.1.3.dev0
 Summary: SDK for creating Opal-compatible tools services
 Home-page: https://github.com/optimizely/opal-tools-sdk
 Author: Optimizely

optimizely_opal_opal_tools_sdk-0.1.3.dev0.dist-info/RECORD

@@ -0,0 +1,10 @@
+opal_tools_sdk/__init__.py,sha256=Eu141xM3QVq1O_BLGZS9m_asU1b_KaOApFtwvaYll6E,170
+opal_tools_sdk/_registry.py,sha256=YE3eD4kcS09QDe4RccBYAzXPo9znEU7fblrsB-g3o-Y,67
+opal_tools_sdk/auth.py,sha256=9aMiZv6n6_iu7hQA0sKg4hgNr5DzYFFuP0SWUoZf_Vw,1520
+opal_tools_sdk/decorators.py,sha256=EE5gjpLRENSZv8cz7wHIIfTCvBh7WqvBaiQtDfMaZig,5268
+opal_tools_sdk/models.py,sha256=lVumBjEWbKtkRBzwXt7m5uagqinJ6Y96K9a5Uw39yaM,2092
+opal_tools_sdk/service.py,sha256=KBqdBHYJ5wgxky0mSv0NJPbbzVhq4YSafgaTbsndTrE,6914
+optimizely_opal_opal_tools_sdk-0.1.3.dev0.dist-info/METADATA,sha256=1pXFL2AInL1gJGBgEwCA5xKu8EoH5pyu0TH_m3y9G8U,4115
+optimizely_opal_opal_tools_sdk-0.1.3.dev0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+optimizely_opal_opal_tools_sdk-0.1.3.dev0.dist-info/top_level.txt,sha256=nCJ5PxF0rgoV6yNJvvuUaZPx4D3EWkl7gpu-6xafH1E,15
+optimizely_opal_opal_tools_sdk-0.1.3.dev0.dist-info/RECORD,,

{optimizely_opal_opal_tools_sdk-0.1.1.dev0.dist-info → optimizely_opal_opal_tools_sdk-0.1.3.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

optimizely_opal_opal_tools_sdk-0.1.1.dev0.dist-info/RECORD

@@ -1,10 +0,0 @@
-opal_tools_sdk/__init__.py,sha256=Eu141xM3QVq1O_BLGZS9m_asU1b_KaOApFtwvaYll6E,170
-opal_tools_sdk/_registry.py,sha256=YE3eD4kcS09QDe4RccBYAzXPo9znEU7fblrsB-g3o-Y,67
-opal_tools_sdk/auth.py,sha256=9aMiZv6n6_iu7hQA0sKg4hgNr5DzYFFuP0SWUoZf_Vw,1520
-opal_tools_sdk/decorators.py,sha256=a_CJcA11RW8eAt2xRGXZane_HvTZqR7wfhn-6WFgjOY,5057
-opal_tools_sdk/models.py,sha256=fa2hhnZ2GTz6xqhGTNyqyIQj_rBE1UFQxsJ4KfApCiU,2123
-opal_tools_sdk/service.py,sha256=tVaQKFpTX778UUWoczlM2WHSiUXqdYtYSKgTdqTH1Z0,6756
-optimizely_opal_opal_tools_sdk-0.1.1.dev0.dist-info/METADATA,sha256=4aDxdgUB-3Z0Je3TgjzFDtgQ9tRVpPdcRAQks0XA5j8,4115
-optimizely_opal_opal_tools_sdk-0.1.1.dev0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-optimizely_opal_opal_tools_sdk-0.1.1.dev0.dist-info/top_level.txt,sha256=nCJ5PxF0rgoV6yNJvvuUaZPx4D3EWkl7gpu-6xafH1E,15
-optimizely_opal_opal_tools_sdk-0.1.1.dev0.dist-info/RECORD,,