qtype 0.0.12__py3-none-any.whl → 0.1.7__py3-none-any.whl

qtype/application/commons/tools.py

@@ -180,7 +180,7 @@ def parse_duration_string(duration: str) -> int:
 
 def format_datetime(timestamp: datetime, format_string: str) -> str:
     """
-    Format a timestamp using a custom format string.
+    Format a timestamp using a custom format string that can be passed to strftime.
 
     Args:
         timestamp: Datetime object to format.

qtype/application/converters/tools_from_api.py

@@ -1,24 +1,489 @@
-from qtype.dsl.model import APITool, AuthorizationProvider
+import logging
+from pathlib import Path
+from typing import Optional
+
+from openapi_parser import parse
+from openapi_parser.enumeration import (
+    AuthenticationScheme,
+    DataType,
+    SecurityType,
+)
+from openapi_parser.specification import Array, Content, Object, Operation
+from openapi_parser.specification import Path as OAPIPath
+from openapi_parser.specification import (
+    RequestBody,
+    Response,
+    Schema,
+    Security,
+)
+
+from qtype.base.types import PrimitiveTypeEnum
+from qtype.dsl.model import (
+    APIKeyAuthProvider,
+    APITool,
+    AuthorizationProvider,
+    AuthProviderType,
+    BearerTokenAuthProvider,
+    CustomType,
+    OAuth2AuthProvider,
+    ToolParameter,
+    VariableType,
+)
+
+
+def _schema_to_qtype_properties(
+    schema: Schema,
+    existing_custom_types: dict[str, CustomType],
+    schema_name_map: dict[int, str],
+) -> dict[str, str]:
+    """Convert OpenAPI Schema properties to QType CustomType properties."""
+    properties = {}
+
+    # Check if schema is an Object type with properties
+    if isinstance(schema, Object) and schema.properties:
+        # Get the list of required properties for this object
+        required_props = schema.required or []
+
+        for prop in schema.properties:
+            prop_type = _schema_to_qtype_type(
+                prop.schema, existing_custom_types, schema_name_map
+            )
+            # Convert to string representation for storage in properties dict
+            prop_type_str = _type_to_string(prop_type)
+
+            # Add '?' suffix for optional properties (not in required list)
+            if prop.name not in required_props:
+                prop_type_str += "?"
+
+            properties[prop.name] = prop_type_str
+    else:
+        # For non-object schemas, create a default property
+        default_type = _schema_to_qtype_type(
+            schema, existing_custom_types, schema_name_map
+        )
+        default_type_str = _type_to_string(default_type)
+        properties["value"] = default_type_str
+
+    return properties
+
+
+def _type_to_string(qtype: PrimitiveTypeEnum | CustomType | str | type) -> str:
+    """Convert a QType to its string representation."""
+    if isinstance(qtype, PrimitiveTypeEnum):
+        return qtype.value
+    elif isinstance(qtype, CustomType):
+        return qtype.id
+    elif isinstance(qtype, type):
+        # Handle domain types like ChatMessage, Embedding, etc.
+        return qtype.__name__
+    else:
+        return str(qtype)
+
+
+def _create_custom_type_from_schema(
+    schema: Schema,
+    existing_custom_types: dict[str, CustomType],
+    schema_name_map: dict[int, str],
+) -> CustomType:
+    """Create a CustomType from an Object schema."""
+    # Generate a unique ID for this schema-based type
+    type_id = None
+
+    schema_hash = hash(str(schema))
+    if schema_hash in schema_name_map:
+        type_id = schema_name_map[schema_hash]
+    else:
+        # make a type id manually
+        if schema.title:
+            # Use title if available, make it lowercase, alphanumeric, snake_case
+            base_id = schema.title.lower().replace(" ", "_").replace("-", "_")
+            # Remove non-alphanumeric characters except underscores
+            type_id = "schema_" + "".join(
+                c for c in base_id if c.isalnum() or c == "_"
+            )
+        else:
+            # Fallback to hash if no title
+            type_id = f"schema_{hash(str(schema))}"
+
+    # Check if we already have this type
+    if type_id in existing_custom_types:
+        return existing_custom_types[type_id]
+
+    # Create properties from the schema
+    properties = _schema_to_qtype_properties(
+        schema, existing_custom_types, schema_name_map
+    )
+
+    # Create the custom type
+    custom_type = CustomType(
+        id=type_id,
+        description=schema.description
+        or schema.title
+        or "Generated from OpenAPI schema",
+        properties=properties,
+    )
+
+    # Store it in the registry to prevent infinite recursion
+    existing_custom_types[type_id] = custom_type
+
+    return custom_type
+
+
+def _schema_to_qtype_type(
+    schema: Schema,
+    existing_custom_types: dict[str, CustomType],
+    schema_name_map: dict[int, str],
+) -> PrimitiveTypeEnum | CustomType | str:
+    """Recursively convert OpenAPI Schema to QType, handling nested types."""
+    match schema.type:
+        case DataType.STRING:
+            return PrimitiveTypeEnum.text
+        case DataType.INTEGER:
+            return PrimitiveTypeEnum.int
+        case DataType.NUMBER:
+            return PrimitiveTypeEnum.float
+        case DataType.BOOLEAN:
+            return PrimitiveTypeEnum.boolean
+        case DataType.ARRAY:
+            if isinstance(schema, Array) and schema.items:
+                item_type = _schema_to_qtype_type(
+                    schema.items, existing_custom_types, schema_name_map
+                )
+                item_type_str = _type_to_string(item_type)
+                return f"list[{item_type_str}]"
+            return "list[text]"  # Default to list of text when no item type is specified
+        case DataType.OBJECT:
+            # For object types, create a custom type
+            return _create_custom_type_from_schema(
+                schema, existing_custom_types, schema_name_map
+            )
+        case DataType.NULL:
+            return PrimitiveTypeEnum.text  # Default to text for null types
+        case _:
+            return PrimitiveTypeEnum.text  # Default fallback
+
+
+def to_variable_type(
+    content: Content,
+    existing_custom_types: dict[str, CustomType],
+    schema_name_map: dict[int, str],
+) -> VariableType | CustomType:
+    """
+    Convert an OpenAPI Content object to a VariableType or CustomType.
+    If it already exists in existing_custom_types, return that instance.
+    """
+    # Check if we have a schema to analyze
+    if not content.schema:
+        return PrimitiveTypeEnum.text
+
+    # Use the recursive schema conversion function
+    result = _schema_to_qtype_type(
+        content.schema, existing_custom_types, schema_name_map
+    )
+
+    # If it's a string (like "list[text]"), we need to return it as-is for now
+    # The semantic layer will handle string-based type references
+    if isinstance(result, str):
+        # For now, return as text since we can't directly represent complex string types
+        # in VariableType union. The semantic resolver will handle this.
+        return PrimitiveTypeEnum.text
+
+    return result
+
+
+def create_tool_parameters_from_body(
+    oas: Response | RequestBody,
+    existing_custom_types: dict[str, CustomType],
+    schema_name_map: dict[int, str],
+    default_param_name: str,
+) -> dict[str, ToolParameter]:
+    """
+    Convert an OpenAPI Response or RequestBody to a dictionary of ToolParameters.
+
+    If the body has only one content type with an Object schema, flatten its properties
+    to individual parameters. Otherwise, create a single parameter with the body type.
+
+    Args:
+        oas: The OpenAPI Response or RequestBody object
+        existing_custom_types: Dictionary of existing custom types
+        schema_name_map: Mapping from schema hash to name
+        default_param_name: Name to use for non-flattened parameter
+
+    Returns:
+        Dictionary of parameter name to ToolParameter objects
+    """
+    # Check if we have content to analyze
+    if not hasattr(oas, "content") or not oas.content:
+        return {}
+
+    content = oas.content[0]
+    input_type = to_variable_type(
+        content, existing_custom_types, schema_name_map
+    )
+
+    # Convert CustomType to string ID for ToolParameter
+    input_type_value = (
+        input_type.id if isinstance(input_type, CustomType) else input_type
+    )
+
+    # Check if we should flatten: if this is a CustomType that exists
+    if (
+        isinstance(input_type, CustomType)
+        and input_type.id in existing_custom_types
+    ):
+        custom_type = existing_custom_types[input_type.id]
+
+        # Flatten the custom type properties to individual parameters
+        flattened_parameters = {}
+        for prop_name, prop_type_str in custom_type.properties.items():
+            # Check if the property is optional (has '?' suffix)
+            is_optional = prop_type_str.endswith("?")
+            clean_type = (
+                prop_type_str.rstrip("?") if is_optional else prop_type_str
+            )
+
+            flattened_parameters[prop_name] = ToolParameter(
+                type=clean_type, optional=is_optional
+            )
+
+        # remove the type from existing_custom_types to avoid confusion
+        del existing_custom_types[input_type.id]
+
+        return flattened_parameters
+
+    # If not flattening, create a single parameter (e.g., for simple types or arrays)
+    return {
+        default_param_name: ToolParameter(
+            type=input_type_value, optional=False
+        )
+    }
+
+
+def to_api_tool(
+    server_url: str,
+    auth: Optional[AuthorizationProvider],
+    path: OAPIPath,
+    operation: Operation,
+    existing_custom_types: dict[str, CustomType],
+    schema_name_map: dict[int, str],
+) -> APITool:
+    """Convert an OpenAPI Path and Operation to a Tool."""
+    endpoint = server_url.rstrip("/") + path.url
+
+    # Generate a unique ID for this tool
+    tool_id = (
+        operation.operation_id
+        or f"{operation.method.value}_{path.url.replace('/', '_').replace('{', '').replace('}', '')}"
+    )
+
+    # Use operation summary as name, fallback to operation_id or generated name
+    tool_name = (
+        operation.summary
+        or operation.operation_id
+        or f"{operation.method.value.upper()} {path.url}"
+    )
+
+    # Use operation description, fallback to summary or generated description
+    tool_description = (
+        operation.description
+        or operation.summary
+        or f"API call to {operation.method.value.upper()} {path.url}"
+    ).replace("\n", " ")
+
+    # Process inputs from request body and parameters
+    inputs = {}
+    if operation.request_body and operation.request_body.content:
+        # Create input parameters from request body using the new function
+        input_params = create_tool_parameters_from_body(
+            operation.request_body,
+            existing_custom_types,
+            schema_name_map,
+            default_param_name="request",
+        )
+        inputs.update(input_params)
+
+    # Add path and query parameters as inputs
+    parameters = {}
+    for param in operation.parameters:
+        if param.schema:
+            param_type = _schema_to_qtype_type(
+                param.schema, existing_custom_types, schema_name_map
+            )
+            # Convert to appropriate type for ToolParameter
+            param_type_value = (
+                param_type.id
+                if isinstance(param_type, CustomType)
+                else param_type
+            )
+            parameters[param.name] = ToolParameter(
+                type=param_type_value, optional=not param.required
+            )
+
+    # Process outputs from responses
+    outputs = {}
+    # Find the success response (200-299 status codes) or default response
+    success_response = next(
+        (r for r in operation.responses if r.code and 200 <= r.code < 300),
+        next((r for r in operation.responses if r.is_default), None),
+    )
+
+    # If we found a success response, create output parameters
+    if success_response and success_response.content:
+        output_params = create_tool_parameters_from_body(
+            success_response,
+            existing_custom_types,
+            schema_name_map,
+            default_param_name="response",
+        )
+        outputs.update(output_params)
+
+    return APITool(
+        id=tool_id,
+        name=tool_name,
+        description=tool_description,
+        endpoint=endpoint,
+        method=operation.method.value.upper(),
+        auth=auth.id if auth else None,  # Use auth ID string instead of object
+        inputs=inputs,
+        outputs=outputs,
+        parameters=parameters,
+    )
+
+
+def to_authorization_provider(
+    api_name: str, scheme_name: str, security: Security
+) -> AuthProviderType:
+    if security.scheme is None:
+        raise ValueError("Security scheme is missing")
+
+    match security.type:
+        case SecurityType.API_KEY:
+            return APIKeyAuthProvider(
+                id=f"{api_name}_{scheme_name}_{security.name or 'api_key'}",
+                api_key="your_api_key_here",  # User will need to configure
+                host=None,  # Will be set from base URL if available
+            )
+        case SecurityType.HTTP:
+            if security.scheme == AuthenticationScheme.BEARER:
+                return BearerTokenAuthProvider(
+                    id=f"{api_name}_{scheme_name}_{security.bearer_format or 'token'}",
+                    token=f"${{{api_name.upper()}_BEARER}}",  # User will need to configure
+                )
+            else:
+                raise ValueError(
+                    f"HTTP authentication scheme '{security.scheme}' is not supported"
+                )
+        case SecurityType.OAUTH2:
+            return OAuth2AuthProvider(
+                id=f"{api_name}_{scheme_name}_{hash(str(security.flows))}",
+                client_id="your_client_id",  # User will need to configure
+                client_secret="your_client_secret",  # User will need to configure
+                token_url=next(
+                    (
+                        flow.token_url
+                        for flow in security.flows.values()
+                        if flow.token_url
+                    ),
+                    "https://example.com/oauth/token",  # Default fallback
+                ),
+                scopes=list(
+                    {
+                        scope
+                        for flow in security.flows.values()
+                        for scope in flow.scopes.keys()
+                    }
+                )
+                if any(flow.scopes for flow in security.flows.values())
+                else [],
+            )
+        case _:
+            raise ValueError(
+                f"Security type '{security.type}' is not supported"
+            )
 
 
 def tools_from_api(
     openapi_spec: str,
-    exclude_paths: list[str] | None = None,
-    include_tags: list[str] | None = None,
-    auth: AuthorizationProvider | str | None = None,
-) -> list[APITool]:
+) -> tuple[str, list[AuthProviderType], list[APITool], list[CustomType]]:
     """
-    Load tools from an OpenAPI specification by introspecting its endpoints.
+    Creates tools from an OpenAPI specification.
 
     Args:
-        module_path: The OpenAPI specification path or URL.
+        openapi_spec: The OpenAPI specification path or URL.
 
     Returns:
-        List of OpenAPIToolProvider instances created from the OpenAPI spec.
+        Tuple containing:
+        - API name
+        - List of authorization providers
+        - List of API tools
+        - List of custom types
 
     Raises:
-        ImportError: If the OpenAPI spec cannot be loaded.
         ValueError: If no valid endpoints are found in the spec.
     """
-    # Placeholder for actual implementation
-    raise NotImplementedError("OpenAPI tool loading not yet implemented")
+
+    # load the spec using
+    specification = parse(openapi_spec)
+    api_name = (
+        specification.info.title.lower().replace(" ", "-")
+        if specification.info and specification.info.title
+        else Path(openapi_spec).stem
+    )
+    # Keep only alphanumeric characters, hyphens, and underscores
+    api_name = "".join(c for c in api_name if c.isalnum() or c in "-_")
+
+    # If security is specified, create an authorization provider.
+    authorization_providers = [
+        to_authorization_provider(api_name, name.lower(), sec)
+        for name, sec in specification.security_schemas.items()
+    ]
+
+    server_url = (
+        specification.servers[0].url
+        if specification.servers
+        else "http://localhost"
+    )
+    if not specification.servers:
+        logging.warning(
+            "No servers defined in the OpenAPI specification. Using http://localhost as default."
+        )
+
+    # Create tools from the parsed specification
+    existing_custom_types: dict[str, CustomType] = {}
+    tools = []
+
+    # Create a mapping from schema hash to their names in the OpenAPI spec
+    # Note: We can't monkey-patch here since the openapi_parser duplicates instances in memory
+    # if they are $ref'd in the content
+    schema_name_map: dict[int, str] = {
+        hash(str(schema)): name.replace(" ", "-").replace("_", "-")
+        for name, schema in specification.schemas.items()
+    }
+
+    # Get the default auth provider if available
+    default_auth = (
+        authorization_providers[0] if authorization_providers else None
+    )
+
+    # Iterate through all paths and operations
+    for path in specification.paths:
+        for operation in path.operations:
+            api_tool = to_api_tool(
+                server_url=server_url,
+                auth=default_auth,
+                path=path,
+                operation=operation,
+                existing_custom_types=existing_custom_types,
+                schema_name_map=schema_name_map,
+            )
+            tools.append(api_tool)
+
+    if not tools:
+        raise ValueError(
+            "No valid endpoints found in the OpenAPI specification"
+        )
+
+    # Convert custom types to a list
+    custom_types = list(existing_custom_types.values())
+
+    return api_name, authorization_providers, tools, custom_types

qtype/application/converters/tools_from_module.py

@@ -5,11 +5,12 @@ from typing import Any, Type, Union, get_args, get_origin
 from pydantic import BaseModel
 
 from qtype.application.converters.types import PYTHON_TYPE_TO_PRIMITIVE_TYPE
-from qtype.dsl.base_types import PrimitiveTypeEnum
+from qtype.base.types import PrimitiveTypeEnum
 from qtype.dsl.model import (
     CustomType,
+    ListType,
     PythonFunctionTool,
-    Variable,
+    ToolParameter,
     VariableType,
 )
 
@@ -134,26 +135,23 @@ def _create_tool_from_function(
         else f"Function {func_name}"
     )
 
-    # Create input variables from function parameters
-    input_variables = [
-        Variable(
-            id=func_name + "." + p["name"],
+    # Create input parameters from function parameters
+    inputs = {
+        p["name"]: ToolParameter(
             type=_map_python_type_to_variable_type(p["type"], custom_types),
+            optional=p["default"] != inspect.Parameter.empty,
         )
         for p in func_info["parameters"]
-    ]
+    }
 
-    # Create output variable based on return type
+    # Create output parameter based on return type
     tool_id = func_info["module"] + "." + func_name
 
     output_type = _map_python_type_to_variable_type(
         func_info["return_type"], custom_types
     )
 
-    output_variable = Variable(
-        id=f"{tool_id}.result",
-        type=output_type,
-    )
+    outputs = {"result": ToolParameter(type=output_type, optional=False)}
 
     return PythonFunctionTool(
         id=tool_id,
@@ -161,8 +159,8 @@ def _create_tool_from_function(
         module_path=func_info["module"],
         function_name=func_name,
         description=description,
-        inputs=input_variables if len(input_variables) > 0 else None,  # type: ignore
-        outputs=[output_variable],
+        inputs=inputs,
+        outputs=outputs,
     )
 
 
@@ -235,6 +233,32 @@ def _map_python_type_to_variable_type(
         VariableType compatible value.
     """
 
+    # Check for generic types like list[str], list[int], etc.
+    origin = get_origin(python_type)
+    if origin is list:
+        # Handle list[T] annotations
+        args = get_args(python_type)
+        if len(args) == 1:
+            element_type_annotation = args[0]
+            # Recursively map the element type
+            element_type = _map_python_type_to_variable_type(
+                element_type_annotation, custom_types
+            )
+            # Support lists of both primitive types and custom types
+            if isinstance(element_type, PrimitiveTypeEnum):
+                return ListType(element_type=element_type)
+            elif isinstance(element_type, str):
+                # Custom type reference
+                return ListType(element_type=element_type)
+            else:
+                raise ValueError(
+                    f"List element type must be primitive or custom type, got: {element_type}"
+                )
+        else:
+            raise ValueError(
+                f"List type must have exactly one type argument, got: {args}"
+            )
+
     if python_type in PYTHON_TYPE_TO_PRIMITIVE_TYPE:
         return PYTHON_TYPE_TO_PRIMITIVE_TYPE[python_type]
     elif python_type in get_args(VariableType):

qtype/application/converters/types.py

@@ -1,33 +1,18 @@
-from datetime import date, datetime, time
-
-from qtype.dsl.base_types import PrimitiveTypeEnum
-
 """
-Mapping of QType primitive types to Python types for internal representations.
+Re-export type mappings from DSL layer for backward compatibility.
+
+This module maintains the application layer's interface while delegating
+to the DSL layer where these mappings are now defined.
 """
-PRIMITIVE_TO_PYTHON_TYPE = {
-    PrimitiveTypeEnum.audio: bytes,
-    PrimitiveTypeEnum.boolean: bool,
-    PrimitiveTypeEnum.bytes: bytes,
-    PrimitiveTypeEnum.date: date,
-    PrimitiveTypeEnum.datetime: datetime,
-    PrimitiveTypeEnum.int: int,
-    PrimitiveTypeEnum.file: bytes,  # Use bytes for file content
-    PrimitiveTypeEnum.float: float,
-    PrimitiveTypeEnum.image: bytes,  # Use bytes for image data
-    PrimitiveTypeEnum.text: str,
-    PrimitiveTypeEnum.time: time,  # Use time for time representation
-    PrimitiveTypeEnum.video: bytes,  # Use bytes for video data
-}
 
-PYTHON_TYPE_TO_PRIMITIVE_TYPE = {
-    bytes: PrimitiveTypeEnum.file,
-    bool: PrimitiveTypeEnum.boolean,
-    str: PrimitiveTypeEnum.text,
-    int: PrimitiveTypeEnum.int,
-    float: PrimitiveTypeEnum.float,
-    date: PrimitiveTypeEnum.date,
-    datetime: PrimitiveTypeEnum.datetime,
-    time: PrimitiveTypeEnum.time,
-    # TODO: decide on internal representation for images, video, and audio, or use annotation/hinting
-}
+from qtype.dsl.types import (
+    PRIMITIVE_TO_PYTHON_TYPE,
+    PYTHON_TYPE_TO_PRIMITIVE_TYPE,
+    python_type_for_list,
+)
+
+__all__ = [
+    "PRIMITIVE_TO_PYTHON_TYPE",
+    "PYTHON_TYPE_TO_PRIMITIVE_TYPE",
+    "python_type_for_list",
+]

qtype/application/documentation.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Any, Type, Union, get_args, get_origin
 
 import qtype.dsl.model as dsl
-from qtype.dsl.base_types import PrimitiveTypeEnum
+from qtype.base.types import PrimitiveTypeEnum
 
 
 def _format_type_name(field_type: Any) -> str: