wellapi 0.4.0__tar.gz → 0.4.2__tar.gz

{wellapi-0.4.0 → wellapi-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wellapi
-Version: 0.4.0
+Version: 0.4.2
 Summary: A simple web framework for aws lambda
 Author-email: romayuhym <romayuhym@gmail.com>
 Requires-Python: >=3.12

{wellapi-0.4.0 → wellapi-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wellapi"
-version = "0.4.0"
+version = "0.4.2"
 description = "A simple web framework for aws lambda"
 readme = "README.md"
 authors = [

wellapi-0.4.2/src/wellapi/awsmodel.py

@@ -0,0 +1,74 @@
+from pydantic import BaseModel, Field
+
+
+class RequestContext(BaseModel):
+    accountId: str
+    apiId: str
+    authorizer: dict = None
+    domainName: str
+    domainPrefix: str
+    extendedRequestId: str
+    httpMethod: str
+    identity: dict
+    path: str
+    protocol: str
+    requestId: str
+    requestTime: str
+    requestTimeEpoch: int
+    resourceId: str
+    resourcePath: str
+    stage: str
+
+
+class ApiGatewayEvent(BaseModel):
+    """
+    https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format
+    """
+    version: str = "1.0"
+    resource: str
+    path: str
+    httpMethod: str
+    headers: dict
+    multiValueHeaders: dict
+    queryStringParameters: dict | None
+    multiValueQueryStringParameters: dict | None
+    requestContext: RequestContext
+    pathParameters: dict | None
+    stageVariables: dict | None
+    body: str | None
+    isBase64Encoded: bool
+
+
+
+class Message(BaseModel):
+    messageId: str
+    receiptHandle: str
+    body: str
+    attributes: dict
+    messageAttributes: dict
+    md5OfBody: str
+    eventSource: str
+    eventSourceARN: str
+    awsRegion: str
+
+
+class SQSEvent(BaseModel):
+    """
+    https://docs.aws.amazon.com/lambda/latest/dg/with-sqs-example.html#with-sqs-create-test-function
+    """
+    Records: list[Message]
+
+
+class JobEvent(BaseModel):
+    """
+    https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-run-lambda-schedule.html#eb-schedule-create-rule
+    """
+    version: str
+    id: str
+    detail_type: str = Field(alias="detail-type")
+    source: str
+    account: str
+    time: str
+    region: str
+    resources: list[str]
+    detail: dict

{wellapi-0.4.0 → wellapi-0.4.2}/src/wellapi/local/router.py

@@ -59,7 +59,7 @@ class Route:
             matched_params = match.groupdict()
             for key, value in matched_params.items():
                 matched_params[key] = self.param_convertors[key].convert(value)
-            path_params = dict(scope.get("pathParameters", {}))
+            path_params = dict(scope.get("pathParameters", {}) or {})
             path_params.update(matched_params)
             child_scope = {"pathParameters": path_params}
 

{wellapi-0.4.0 → wellapi-0.4.2}/src/wellapi/local/server.py

@@ -98,10 +98,36 @@ def get_request_handler(router: Router):
                 headers.setdefault(key, []).append(value)
 
             event = {
+                "version": "1.0",
+                "resource": "/my/path",
                 "httpMethod": method,
                 "path": path,
                 "multiValueHeaders": headers,
                 "body": body,
+                "headers": {},
+                "queryStringParameters": {},
+                "requestContext": {
+                    'resourceId': 'zdo27u',
+                    'resourcePath': path,
+                    'operationName': 'main.hello',
+                    'httpMethod': method,
+                    'extendedRequestId': 'J449EG3OliAEceQ=',
+                    'requestTime': '01/May/2025:12:53:13 +0000',
+                    'path': '/prod/hello',
+                    'accountId': '125905311728',
+                    'protocol': 'HTTP/1.1',
+                    'stage': 'prod',
+                    'domainPrefix': 'pxeuu259g4',
+                    'requestTimeEpoch': 1746103993615,
+                    'requestId': '00cc795f-6b70-4f4d-9d7f-1800b9af134e',
+                    'identity': {},
+                    'domainName': 'pxeuu259g4.execute-api.eu-central-1.amazonaws.com',
+                    'deploymentId': 'q4efka',
+                    'apiId': 'pxeuu259g4'
+                },
+                "pathParameters": None,
+                "stageVariables": None,
+                "isBase64Encoded": False,
             }
 
             # Парсимо query параметри
@@ -113,6 +139,8 @@ def get_request_handler(router: Router):
                         key, value = param.split("=")
                         query_params.setdefault(key, []).append(value)
                 event["multiValueQueryStringParameters"] = query_params
+            else:
+                event["multiValueQueryStringParameters"] = {}
 
             return event
 

{wellapi-0.4.0 → wellapi-0.4.2}/src/wellapi/models.py

@@ -1,15 +1,13 @@
 import json
 import typing
 
+from wellapi.awsmodel import JobEvent, SQSEvent, ApiGatewayEvent
 from wellapi.datastructures import Headers, MutableHeaders, QueryParams
 
 
 class RequestAPIGateway:
-    """
-    https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format
-    """
-
-    def __init__(self, path_params, query_params, headers, body, cookies):
+    def __init__(self, path_params, query_params, headers, body, cookies, raw_event: dict[str, typing.Any]):
+        self.raw_event = ApiGatewayEvent(**raw_event)
         self.path_params = path_params
         self.query_params = QueryParams(query_params)
         self.headers = Headers(raw=headers)
@@ -56,7 +54,7 @@ class RequestAPIGateway:
             else:
                 query_params.append((q_name, q_value))
 
-        return cls(path_params, query_params, headers, body, cookies)
+        return cls(path_params, query_params, headers, body, cookies, raw_event=event)
 
 
 class ResponseAPIGateway:
@@ -93,11 +91,8 @@ class ResponseAPIGateway:
 
 
 class RequestSQS:
-    """
-    https://docs.aws.amazon.com/lambda/latest/dg/with-sqs-example.html#with-sqs-create-test-function
-    """
-
-    def __init__(self, records: list[dict[str, typing.Any]]):
+    def __init__(self, records: list[dict[str, typing.Any]], raw_event: dict[str, typing.Any]):
+        self.raw_event = SQSEvent(**raw_event)
         self._records = records
         self.path_params = None
         self.query_params = None
@@ -110,7 +105,7 @@ class RequestSQS:
         Create a RequestAPIGateway object from the AWS API Gateway event.
         """
 
-        return cls(event["Records"])
+        return cls(event["Records"], raw_event=event)
 
     def json(self):
         """
@@ -127,12 +122,8 @@ class RequestSQS:
 
 
 class RequestJob:
-    """
-    https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-run-lambda-schedule.html#eb-schedule-create-rule
-    """
-
-    def __init__(self, event: dict[str, typing.Any]):
-        self._event = event
+    def __init__(self, raw_event: dict[str, typing.Any]):
+        self.raw_event = JobEvent(**raw_event)
         self.path_params = None
         self.query_params = None
         self.headers = None

{wellapi-0.4.0 → wellapi-0.4.2}/src/wellapi/utils.py

@@ -30,6 +30,9 @@ def load_handlers(handlers_dir: str):
 
     # Імпортуємо всі Python файли з директорії
     for file_path in handlers_path.glob("*.py"):
+        if file_path.stem == "__init__":
+            continue
+
         module_name = f"{handlers_module}.{file_path.stem}"
         try:
             importlib.import_module(module_name)

{wellapi-0.4.0 → wellapi-0.4.2}/uv.lock

@@ -328,7 +328,7 @@ wheels = [
 
 [[package]]
 name = "wellapi"
-version = "0.4.0"
+version = "0.4.2"
 source = { editable = "." }
 dependencies = [
     { name = "email-validator" },