openapi-httpx-client 0.4.0__tar.gz → 0.4.2__tar.gz

{openapi-httpx-client-0.4.0 → openapi-httpx-client-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openapi-httpx-client
-Version: 0.4.0
+Version: 0.4.2
 Summary: A Python client for OpenAPI specifications using httpx
 Home-page: https://github.com/lloydzhou/openapiclient
 Author: lloydzhou
@@ -47,6 +47,11 @@ async def main():
         pet = await client.getPetById(petId=1)
         print(f"Status: {pet['status']}")
         print(f"Pet data: {pet['data']}")
+
+        # Call operations directly as methods, using positional arguments, can using in path and query
+        pet = await client.getPetById(1)
+        print(f"Status: {pet['status']}")
+        print(f"Pet data: {pet['data']}")
         
         # Alternative way to call methods
         pet = await client("getPetById", petId=2)

{openapi-httpx-client-0.4.0 → openapi-httpx-client-0.4.2}/README.md

@@ -32,6 +32,11 @@ async def main():
         pet = await client.getPetById(petId=1)
         print(f"Status: {pet['status']}")
         print(f"Pet data: {pet['data']}")
+
+        # Call operations directly as methods, using positional arguments, can using in path and query
+        pet = await client.getPetById(1)
+        print(f"Status: {pet['status']}")
+        print(f"Pet data: {pet['data']}")
         
         # Alternative way to call methods
         pet = await client("getPetById", petId=2)

{openapi-httpx-client-0.4.0 → openapi-httpx-client-0.4.2}/openapi_httpx_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openapi-httpx-client
-Version: 0.4.0
+Version: 0.4.2
 Summary: A Python client for OpenAPI specifications using httpx
 Home-page: https://github.com/lloydzhou/openapiclient
 Author: lloydzhou
@@ -47,6 +47,11 @@ async def main():
         pet = await client.getPetById(petId=1)
         print(f"Status: {pet['status']}")
         print(f"Pet data: {pet['data']}")
+
+        # Call operations directly as methods, using positional arguments, can using in path and query
+        pet = await client.getPetById(1)
+        print(f"Status: {pet['status']}")
+        print(f"Pet data: {pet['data']}")
         
         # Alternative way to call methods
         pet = await client("getPetById", petId=2)

{openapi-httpx-client-0.4.0 → openapi-httpx-client-0.4.2}/openapi_httpx_client.egg-info/requires.txt

@@ -1,3 +1,2 @@
 httpx>=0.23.0
 pyyaml>=6.0
-nanoid>=0.2.1

{openapi-httpx-client-0.4.0 → openapi-httpx-client-0.4.2}/openapiclient/client.py

@@ -1,10 +1,8 @@
 import httpx
 import json
 import os.path
-from typing import Dict, List, Any, Optional, Union, Callable, Type
 from urllib.parse import urljoin, urlparse
 import yaml
-from nanoid import generate as nanoid_generate
 
 # 合并DynamicClientBase和BaseClient为一个基类
 class BaseClient:
@@ -189,6 +187,10 @@ class OpenAPIClient:
 
     async def _load_definition_async(self):
         """Load the OpenAPI definition asynchronously"""
+        # Check if definition is already loaded
+        if self.definition:
+            return
+
         if isinstance(self.definition_source, dict):
             self.definition = self.definition_source
             return
@@ -209,6 +211,10 @@ class OpenAPIClient:
 
     def _load_definition_sync(self):
         """Load the OpenAPI definition synchronously"""
+        # Check if definition is already loaded
+        if self.definition:
+            return
+
         if isinstance(self.definition_source, dict):
             self.definition = self.definition_source
             return
@@ -283,38 +289,43 @@ class OpenAPIClient:
 
     def create_tool(self, operation_id, operation, all_references):
         """Create an AI tool description from operation data"""
-        # Get parameters from the request body schema only for json content
+        # Get parameters from the request body schema
         body = operation.get('requestBody', {})
-        schema = body.get('content', {}).get('application/json', {}).get('schema', {})
-        parameters = {
-            "type": "object",
-            "required": ['body'] if body.get("required", False) else [],
-            "description": body.get('description', ''),
-            "properties": {
-                "body": self.resolve_schema_ref(schema, all_references) if schema else {},
-            }
-        }
+        content = body.get('content', {})
+        schema = content.get('application/json', {}).get('schema', {}) or content.get('application/xml', {}).get('schema', {}) or content.get('application/x-www-form-urlencoded', {}).get('schema', {})
+        json_schema = self.resolve_schema_ref(schema, all_references) if schema else { "type": "object", "properties": {} }
+
+        if not json_schema.get('description'):
+            json_schema['description'] = body.get('description', '')
+
         # add parameters from path and query
-        for parameter in operation.get('parameters', []):
-            name = parameter.get('name')
-            if parameter.get('required', False):
-                parameters["required"].append(name)
-            item = {
-                "type": parameter.get('schema', {}).get('type', 'string'),
-                "description": parameter.get('description', ''),
-            }
-            # Add format, enum, and example if available
-            for key in ['format', 'enum', 'example']:
-                if parameter.get('schema', {}).get(key):
-                    item[key] = parameter.get('schema', {}).get(key)
-            parameters["properties"][name] = item
+        parameters = operation.get('parameters', [])
+        if len(parameters) > 0:
+            if not json_schema.get('required'):
+                json_schema['required'] = []
+            if not json_schema.get('properties'):
+                json_schema['properties'] = {}
+            for parameter in parameters:
+                name = parameter.get('name')
+                if parameter.get('required', False):
+                    json_schema["required"].append(name)
+
+                parameter_schema = {
+                    "type": parameter.get('schema', {}).get('type', 'string'),
+                    "description": parameter.get('description', ''),
+                }
+                # Add format, enum, and example if available
+                for key in ['format', 'enum', 'example']:
+                    if parameter.get('schema', {}).get(key):
+                        parameter_schema[key] = parameter.get('schema', {}).get(key)
+                json_schema["properties"][name] = parameter_schema
 
         return {
             "type": "function",
             "function": {
                 "name": operation_id,
                 "description": operation.get('summary', '') or operation.get('description', ''),
-                "parameters": parameters,
+                "parameters": json_schema,
             }
         }
 
@@ -368,13 +379,14 @@ class OpenAPIClient:
         client_instance.paths = paths
         client_instance.tools = tools
 
-    def _prepare_request_params(self, path, operation, kwargs):
+    def _prepare_request_params(self, path, operation, args, kwargs):
         """
         Prepare request parameters for an API operation.
 
         Args:
             path: The path template
             operation: Operation object
+            args: Positional arguments passed to the operation
             kwargs: Keyword arguments passed to the operation
 
         Returns:
@@ -391,6 +403,8 @@ class OpenAPIClient:
                 name = param.get('name')
                 if name in kwargs:
                     path_params[name] = kwargs.pop(name)
+                elif len(args) > 0:
+                    path_params[name] = args.pop(0)  # Pop the first positional argument
 
         # Replace path parameters in the URL
         for name, value in path_params.items():
@@ -406,6 +420,8 @@ class OpenAPIClient:
                 name = param.get('name')
                 if name in kwargs:
                     query_params[name] = kwargs.pop(name)
+                elif len(args) > 0:
+                    query_params[name] = args.pop(0)  # Pop the first positional argument
 
         # Handle headers
         headers = kwargs.pop('headers', {})
@@ -413,7 +429,7 @@ class OpenAPIClient:
         # Handle request body
         body = kwargs.pop('data', None) or kwargs.pop('body', None)
         # json body
-        if not body and len(kwargs) > 0 and operation.get('requestBody', {}).get('content', {}).get('application/json'):
+        if not body and len(kwargs) > 0 and operation.get('requestBody', {}).get('content', {}):
             body = kwargs.copy()
             kwargs.clear()  # Clear the kwargs after using them as body
 
@@ -460,7 +476,7 @@ class OpenAPIClient:
             async def operation_method(*args, **kwargs):
                 # Prepare request parameters
                 full_url, query_params, body, headers, remaining_kwargs = self._prepare_request_params(
-                    path, operation, kwargs.copy()
+                    path, operation, list(args), kwargs.copy()
                 )
 
                 # Make the async request
@@ -479,7 +495,7 @@ class OpenAPIClient:
             def operation_method(*args, **kwargs):
                 # Prepare request parameters
                 full_url, query_params, body, headers, remaining_kwargs = self._prepare_request_params(
-                    path, operation, kwargs.copy()
+                    path, operation, list(args), kwargs.copy()
                 )
 
                 # Make the sync request

{openapi-httpx-client-0.4.0 → openapi-httpx-client-0.4.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="openapi-httpx-client",
-    version="0.4.0",
+    version="0.4.2",
     author="lloydzhou",
     author_email="lloydzhou@qq.com",
     description="A Python client for OpenAPI specifications using httpx",
@@ -16,7 +16,6 @@ setup(
     install_requires=[
         "httpx>=0.23.0",
         "pyyaml>=6.0",
-        "nanoid>=0.2.1",
     ],
     classifiers=[
         "Programming Language :: Python :: 3",