optimizely-opal.opal-tools-sdk 0.1.5.dev0__tar.gz → 0.1.10.dev0__tar.gz

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optimizely-opal.opal-tools-sdk
-Version: 0.1.5.dev0
+Version: 0.1.10.dev0
 Summary: SDK for creating Opal-compatible tools services
 Home-page: https://github.com/optimizely/opal-tools-sdk
 Author: Optimizely
@@ -223,6 +223,8 @@ Actions represent buttons or operations:
 Contains the complete island configuration:
 - `fields`: List of IslandConfig.Field objects
 - `actions`: List of IslandConfig.Action objects
+- `type`: Island type for UI rendering (optional, default: `None`)
+- `icon`: Icon to display in the island (optional, default: `None`)
 
 #### IslandResponse
 The response wrapper for islands:

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/README.md

@@ -199,6 +199,8 @@ Actions represent buttons or operations:
 Contains the complete island configuration:
 - `fields`: List of IslandConfig.Field objects
 - `actions`: List of IslandConfig.Action objects
+- `type`: Island type for UI rendering (optional, default: `None`)
+- `icon`: Icon to display in the island (optional, default: `None`)
 
 #### IslandResponse
 The response wrapper for islands:

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/opal_tools_sdk/decorators.py

@@ -62,25 +62,48 @@ def tool(name: str, description: str, auth_requirements: Optional[List[Dict[str,
                 else:
                     field_type = str
 
+                # Check if the field is Optional (Union with None)
+                # Optional[X] is equivalent to Union[X, None]
+                type_args = getattr(field_type, '__args__', ())
+                is_optional = get_origin(field_type) is Union and type(None) in type_args
+
+                # Extract the actual type from Optional[T]
+                if is_optional and type_args:
+                    # Get the non-None type from Union[T, None]
+                    field_type = next(
+                        (arg for arg in type_args if arg is not type(None)),
+                        field_type,
+                    )
+
                 # Map Python type to Parameter type
                 param_type = ParameterType.string
-                if field_type == int:
+                if field_type is int:
                     param_type = ParameterType.integer
-                elif field_type == float:
+                elif field_type is float:
                     param_type = ParameterType.number
-                elif field_type == bool:
+                elif field_type is bool:
                     param_type = ParameterType.boolean
-                elif get_origin(field_type) is list:
+                elif field_type is list or get_origin(field_type) is list:
                     param_type = ParameterType.list
-                elif get_origin(field_type) is dict:
+                elif field_type is dict or get_origin(field_type) is dict:
                     param_type = ParameterType.dictionary
 
                 # Determine if required
                 field_info_extra = getattr(field_info, "json_schema_extra") or {}
                 if "required" in field_info_extra:
                     required = field_info_extra["required"]
+                # If the field is typed as Optional, it's not required (check this FIRST)
+                elif is_optional:
+                    required = False
+                # Check for Pydantic v2 is_required() method
+                elif hasattr(field_info, 'is_required'):
+                    required = field_info.is_required()
+                # Fall back to checking if default is ... (Pydantic v1/v2 compatibility)
+                elif hasattr(field_info, 'default'):
+                    required = field_info.default is ...
                 else:
-                    required = field_info.default is ... if hasattr(field_info, 'default') else True
+                    # If no default attribute at all, assume required
+                    required = True
 
                 # Get description
                 description_text = ""

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/opal_tools_sdk/models.py

@@ -112,6 +112,8 @@ class IslandConfig(BaseModel):
 
     fields: list[Field]
     actions: list[Action]
+    type: Optional[str] = None
+    icon: Optional[str] = None
 
 
 class IslandResponse(BaseModel):
@@ -120,7 +122,8 @@ class IslandResponse(BaseModel):
 
     type: Literal["island"]
     config: ResponseConfig
+    message: Optional[str] = None
 
     @classmethod
-    def create(cls, islands: list[IslandConfig]):
-        return cls(type="island", config=cls.ResponseConfig(islands=islands))
+    def create(cls, islands: list[IslandConfig], message: Optional[str] = None):
+        return cls(type="island", config=cls.ResponseConfig(islands=islands), message=message)

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/opal_tools_sdk/service.py

@@ -1,15 +1,16 @@
-from typing import Dict, List, Any, Callable, Type, Optional, get_type_hints
+from typing import Dict, List, Any, Callable, Optional, get_type_hints
 import inspect
 import logging
-from fastapi import FastAPI, APIRouter, Depends, Header, HTTPException, Request
+from fastapi import FastAPI, APIRouter, HTTPException, Request
 from fastapi.routing import APIRoute
-from pydantic import BaseModel, create_model
+from pydantic import BaseModel, ValidationError
 
-from .models import Function, Parameter, ParameterType, AuthRequirement
+from .models import Function, Parameter, AuthRequirement
 from . import _registry
 
 logger = logging.getLogger(__name__)
 
+
 class ToolsService:
     """Main class for managing Opal tools."""
 
@@ -33,15 +34,12 @@ class ToolsService:
             routes = []
             for route in app.routes:
                 if isinstance(route, APIRoute):
-                    routes.append({
-                        "path": route.path,
-                        "name": route.name,
-                        "methods": route.methods
-                    })
+                    routes.append({"path": route.path, "name": route.name, "methods": route.methods})
             return {"routes": routes}
 
     def _init_routes(self) -> None:
         """Initialize the discovery endpoint."""
+
         @self.router.get("/discovery")
         async def discovery() -> Dict[str, Any]:
             """Return the discovery information for this tools service."""
@@ -66,21 +64,23 @@ class ToolsService:
             # Auth requirements should always be a list
             if isinstance(handler.__auth_requirements__, list):
                 for req in handler.__auth_requirements__:
-                    auth_requirements.append(AuthRequirement(
-                        provider=req.get("provider", ""),
-                        scope_bundle=req.get("scope_bundle", ""),
-                        required=req.get("required", True)
-                    ))
+                    auth_requirements.append(
+                        AuthRequirement(
+                            provider=req.get("provider", ""), scope_bundle=req.get("scope_bundle", ""), required=req.get("required", True)
+                        )
+                    )
 
         return auth_requirements
 
-    def register_tool(self,
-                     name: str,
-                     description: str,
-                     handler: Callable,
-                     parameters: List[Parameter],
-                     endpoint: str,
-                     auth_requirements: Optional[List[AuthRequirement]] = None) -> None:
+    def register_tool(
+        self,
+        name: str,
+        description: str,
+        handler: Callable,
+        parameters: List[Parameter],
+        endpoint: str,
+        auth_requirements: Optional[List[AuthRequirement]] = None,
+    ) -> None:
         """Register a tool function.
 
         Args:
@@ -101,11 +101,7 @@ class ToolsService:
         final_auth_requirements = auth_requirements if auth_requirements else handler_auth_requirements
 
         function = Function(
-            name=name,
-            description=description,
-            parameters=parameters,
-            endpoint=endpoint,
-            auth_requirements=final_auth_requirements
+            name=name, description=description, parameters=parameters, endpoint=endpoint, auth_requirements=final_auth_requirements
         )
 
         self.functions.append(function)
@@ -144,7 +140,6 @@ class ToolsService:
                 param_name = list(sig.parameters.keys())[0]
                 param_type = get_type_hints(handler).get(param_name)
 
-
                 args = []
                 kwargs = {}
                 if param_type:
@@ -168,8 +163,12 @@ class ToolsService:
 
                 logger.info(f"Tool {name} returned: {result}")
                 return result
+            except ValidationError as e:
+                logger.warning(f"Invalid parameters predicted by LLM for tool {name}: {str(e)}")
+                raise HTTPException(status_code=400, detail=str(e))
             except Exception as e:
                 import traceback
+
                 logger.error(f"Error in tool {name}: {str(e)}")
                 logger.error(traceback.format_exc())
                 raise HTTPException(status_code=500, detail=str(e))

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/optimizely_opal.opal_tools_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optimizely-opal.opal-tools-sdk
-Version: 0.1.5.dev0
+Version: 0.1.10.dev0
 Summary: SDK for creating Opal-compatible tools services
 Home-page: https://github.com/optimizely/opal-tools-sdk
 Author: Optimizely
@@ -223,6 +223,8 @@ Actions represent buttons or operations:
 Contains the complete island configuration:
 - `fields`: List of IslandConfig.Field objects
 - `actions`: List of IslandConfig.Action objects
+- `type`: Island type for UI rendering (optional, default: `None`)
+- `icon`: Icon to display in the island (optional, default: `None`)
 
 #### IslandResponse
 The response wrapper for islands:

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "optimizely-opal.opal-tools-sdk"
-version = "0.1.5-dev"
+version = "0.1.10-dev"
 description = "SDK for creating Opal-compatible tools services"
 authors = [
     {name = "Optimizely", email = "opal-team@optimizely.com"}

{optimizely_opal_opal_tools_sdk-0.1.5.dev0 → optimizely_opal_opal_tools_sdk-0.1.10.dev0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="optimizely-opal.opal-tools-sdk",
-    version="0.1.4-dev",
+    version="0.1.10-dev",
     packages=find_packages(),
     install_requires=[
         "fastapi>=0.100.0",