kailash 0.2.2__py3-none-any.whl → 0.3.1__py3-none-any.whl

kailash/nodes/api/auth.py

@@ -12,7 +12,7 @@ Key Components:
 
 import base64
 import time
-from typing import Any, Dict
+from typing import Any
 
 import requests
 
@@ -42,7 +42,7 @@ class BasicAuthNode(Node):
     - RESTClientNode: Uses auth headers for API calls
     """
 
-    def get_parameters(self) -> Dict[str, NodeParameter]:
+    def get_parameters(self) -> dict[str, NodeParameter]:
         """Define the parameters this node accepts.
 
         Returns:
@@ -63,7 +63,7 @@ class BasicAuthNode(Node):
             ),
         }
 
-    def get_output_schema(self) -> Dict[str, NodeParameter]:
+    def get_output_schema(self) -> dict[str, NodeParameter]:
         """Define the output schema for this node.
 
         Returns:
@@ -84,7 +84,7 @@ class BasicAuthNode(Node):
             ),
         }
 
-    def run(self, **kwargs) -> Dict[str, Any]:
+    def run(self, **kwargs) -> dict[str, Any]:
         """Generate Basic Authentication headers.
 
         Args:
@@ -162,7 +162,7 @@ class OAuth2Node(Node):
         self.token_data = None  # Will store token information
         self.token_expires_at = 0  # Timestamp when token expires
 
-    def get_parameters(self) -> Dict[str, NodeParameter]:
+    def get_parameters(self) -> dict[str, NodeParameter]:
         """Define the parameters this node accepts.
 
         Returns:
@@ -236,7 +236,7 @@ class OAuth2Node(Node):
             ),
         }
 
-    def get_output_schema(self) -> Dict[str, NodeParameter]:
+    def get_output_schema(self) -> dict[str, NodeParameter]:
         """Define the output schema for this node.
 
         Returns:
@@ -269,7 +269,7 @@ class OAuth2Node(Node):
             ),
         }
 
-    def _get_token(self, **kwargs) -> Dict[str, Any]:
+    def _get_token(self, **kwargs) -> dict[str, Any]:
         """Get an OAuth token using the configured grant type.
 
         This method handles different grant types with appropriate parameters.
@@ -359,7 +359,7 @@ class OAuth2Node(Node):
                 f"Failed to parse OAuth token response: {str(e)}"
             ) from e
 
-    def run(self, **kwargs) -> Dict[str, Any]:
+    def run(self, **kwargs) -> dict[str, Any]:
         """Get OAuth authentication headers.
 
         This method handles token acquisition, caching, and renewal based on
@@ -444,7 +444,7 @@ class APIKeyNode(Node):
     - RESTClientNode: Uses auth data for API calls
     """
 
-    def get_parameters(self) -> Dict[str, NodeParameter]:
+    def get_parameters(self) -> dict[str, NodeParameter]:
         """Define the parameters this node accepts.
 
         Returns:
@@ -477,7 +477,7 @@ class APIKeyNode(Node):
             ),
         }
 
-    def get_output_schema(self) -> Dict[str, NodeParameter]:
+    def get_output_schema(self) -> dict[str, NodeParameter]:
         """Define the output schema for this node.
 
         Returns:
@@ -510,7 +510,7 @@ class APIKeyNode(Node):
             ),
         }
 
-    def run(self, **kwargs) -> Dict[str, Any]:
+    def run(self, **kwargs) -> dict[str, Any]:
         """Generate API key authentication data.
 
         Args:

kailash/nodes/api/graphql.py

@@ -10,7 +10,7 @@ Key Components:
 - GraphQL query building and response handling utilities
 """
 
-from typing import Any, Dict, Optional
+from typing import Any
 
 from kailash.nodes.api.http import AsyncHTTPRequestNode, HTTPRequestNode
 from kailash.nodes.base import Node, NodeParameter, register_node
@@ -60,7 +60,7 @@ class GraphQLClientNode(Node):
         super().__init__(**kwargs)
         self.http_node = HTTPRequestNode(**kwargs)
 
-    def get_parameters(self) -> Dict[str, NodeParameter]:
+    def get_parameters(self) -> dict[str, NodeParameter]:
         """Define the parameters this node accepts.
 
         Returns:
@@ -137,7 +137,7 @@ class GraphQLClientNode(Node):
             ),
         }
 
-    def get_output_schema(self) -> Dict[str, NodeParameter]:
+    def get_output_schema(self) -> dict[str, NodeParameter]:
         """Define the output schema for this node.
 
         Returns:
@@ -173,9 +173,9 @@ class GraphQLClientNode(Node):
     def _build_graphql_payload(
         self,
         query: str,
-        variables: Dict[str, Any] = None,
-        operation_name: Optional[str] = None,
-    ) -> Dict[str, Any]:
+        variables: dict[str, Any] = None,
+        operation_name: str | None = None,
+    ) -> dict[str, Any]:
         """Build a GraphQL request payload.
 
         Args:
@@ -197,8 +197,8 @@ class GraphQLClientNode(Node):
         return payload
 
     def _process_graphql_response(
-        self, response: Dict[str, Any], flatten_response: bool = False
-    ) -> Dict[str, Any]:
+        self, response: dict[str, Any], flatten_response: bool = False
+    ) -> dict[str, Any]:
         """Process a GraphQL response.
 
         Args:
@@ -241,7 +241,7 @@ class GraphQLClientNode(Node):
 
         return {"data": data, "errors": errors, "success": success}
 
-    def run(self, **kwargs) -> Dict[str, Any]:
+    def run(self, **kwargs) -> dict[str, Any]:
         """Execute a GraphQL query or mutation.
 
         Args:
@@ -362,7 +362,7 @@ class AsyncGraphQLClientNode(AsyncNode):
         self.http_node = AsyncHTTPRequestNode(**kwargs)
         self.graphql_node = GraphQLClientNode(**kwargs)
 
-    def get_parameters(self) -> Dict[str, NodeParameter]:
+    def get_parameters(self) -> dict[str, NodeParameter]:
         """Define the parameters this node accepts.
 
         Returns:
@@ -371,7 +371,7 @@ class AsyncGraphQLClientNode(AsyncNode):
         # Same parameters as the synchronous version
         return self.graphql_node.get_parameters()
 
-    def get_output_schema(self) -> Dict[str, NodeParameter]:
+    def get_output_schema(self) -> dict[str, NodeParameter]:
         """Define the output schema for this node.
 
         Returns:
@@ -380,7 +380,7 @@ class AsyncGraphQLClientNode(AsyncNode):
         # Same output schema as the synchronous version
         return self.graphql_node.get_output_schema()
 
-    def run(self, **kwargs) -> Dict[str, Any]:
+    def run(self, **kwargs) -> dict[str, Any]:
         """Synchronous version of the GraphQL request, for compatibility.
 
         This is implemented for compatibility but users should use the
@@ -399,7 +399,7 @@ class AsyncGraphQLClientNode(AsyncNode):
         # Forward to the synchronous GraphQL node
         return self.graphql_node.run(**kwargs)
 
-    async def async_run(self, **kwargs) -> Dict[str, Any]:
+    async def async_run(self, **kwargs) -> dict[str, Any]:
         """Execute a GraphQL query or mutation asynchronously.
 
         Args:

kailash/nodes/api/http.py

@@ -8,7 +8,7 @@ import asyncio
 import base64
 import time
 from enum import Enum
-from typing import Any, Dict, Optional
+from typing import Any
 
 import aiohttp
 import requests
@@ -48,8 +48,8 @@ class HTTPResponse(BaseModel):
     """
 
     status_code: int
-    headers: Dict[str, str]
-    content_type: Optional[str] = None
+    headers: dict[str, str]
+    content_type: str | None = None
     content: Any  # Can be dict, str, bytes depending on response format
     response_time_ms: float
     url: str
@@ -194,7 +194,7 @@ class HTTPRequestNode(Node):
         super().__init__(**kwargs)
         self.session = requests.Session()
 
-    def get_parameters(self) -> Dict[str, NodeParameter]:
+    def get_parameters(self) -> dict[str, NodeParameter]:
         """Define the parameters this node accepts.
 
         Returns:
@@ -328,7 +328,7 @@ class HTTPRequestNode(Node):
             ),
         }
 
-    def get_output_schema(self) -> Dict[str, NodeParameter]:
+    def get_output_schema(self) -> dict[str, NodeParameter]:
         """Define the output schema for this node.
 
         Returns:
@@ -358,10 +358,10 @@ class HTTPRequestNode(Node):
     def _apply_authentication(
         self,
         headers: dict,
-        auth_type: Optional[str],
-        auth_token: Optional[str],
-        auth_username: Optional[str],
-        auth_password: Optional[str],
+        auth_type: str | None,
+        auth_token: str | None,
+        auth_username: str | None,
+        auth_password: str | None,
         api_key_header: str,
     ) -> dict:
         """Apply authentication to request headers.
@@ -398,7 +398,7 @@ class HTTPRequestNode(Node):
 
         return auth_headers
 
-    def run(self, **kwargs) -> Dict[str, Any]:
+    def run(self, **kwargs) -> dict[str, Any]:
         """Execute an HTTP request.
 
         Args:
@@ -683,7 +683,7 @@ class AsyncHTTPRequestNode(AsyncNode):
         super().__init__(**kwargs)
         self._session = None  # Will be created when needed
 
-    def get_parameters(self) -> Dict[str, NodeParameter]:
+    def get_parameters(self) -> dict[str, NodeParameter]:
         """Define the parameters this node accepts.
 
         Returns:
@@ -692,7 +692,7 @@ class AsyncHTTPRequestNode(AsyncNode):
         # Same parameters as the synchronous version
         return HTTPRequestNode().get_parameters()
 
-    def get_output_schema(self) -> Dict[str, NodeParameter]:
+    def get_output_schema(self) -> dict[str, NodeParameter]:
         """Define the output schema for this node.
 
         Returns:
@@ -704,10 +704,10 @@ class AsyncHTTPRequestNode(AsyncNode):
     def _apply_authentication(
         self,
         headers: dict,
-        auth_type: Optional[str],
-        auth_token: Optional[str],
-        auth_username: Optional[str],
-        auth_password: Optional[str],
+        auth_type: str | None,
+        auth_token: str | None,
+        auth_username: str | None,
+        auth_password: str | None,
         api_key_header: str,
     ) -> dict:
         """Apply authentication to request headers.
@@ -744,7 +744,7 @@ class AsyncHTTPRequestNode(AsyncNode):
 
         return auth_headers
 
-    def run(self, **kwargs) -> Dict[str, Any]:
+    def run(self, **kwargs) -> dict[str, Any]:
         """Synchronous version of the request, for compatibility.
 
         This is implemented for compatibility but users should use the
@@ -763,7 +763,7 @@ class AsyncHTTPRequestNode(AsyncNode):
         http_node = HTTPRequestNode(**self.config)
         return http_node.run(**kwargs)
 
-    async def async_run(self, **kwargs) -> Dict[str, Any]:
+    async def async_run(self, **kwargs) -> dict[str, Any]:
         """Execute an HTTP request asynchronously.
 
         Args:
@@ -937,7 +937,7 @@ class AsyncHTTPRequestNode(AsyncNode):
 
                     return result
 
-            except (aiohttp.ClientError, asyncio.TimeoutError) as e:
+            except (TimeoutError, aiohttp.ClientError) as e:
                 self.logger.warning(f"Async request failed: {str(e)}")
 
                 # Last attempt, no more retries