fix import errors

Author: mrtedn21

martin_eden/__init__.py

@@ -1,7 +1,7 @@
 from martin_eden import core
 from martin_eden import database
 from martin_eden import http_utils
-from martin_eden import main
+from martin_eden import base
 from martin_eden import openapi
 from martin_eden import routing
 from martin_eden import utils
@@ -10,7 +10,7 @@
     'core',
     'database',
     'http_utils',
-    'main',
+    'base',
     'openapi',
     'routing',
     'utils',

martin_eden/base.py

@@ -0,0 +1,49 @@
+from typing import ParamSpecArgs, ParamSpecKwargs, Any
+
+from marshmallow import Schema
+from marshmallow.decorators import post_dump
+from marshmallow_jsonschema import JSONSchema
+
+
+class Controller:
+    """The class needs only as type hint"""
+    request_schema: Schema
+    response_schema: Schema
+    query_params: dict
+
+    def __call__(
+        self, *args: ParamSpecArgs, **kwargs: ParamSpecKwargs,
+    ) -> None:
+        pass
+
+
+class CustomSchema(Schema):
+    def __init__(
+        self,
+        *args: ParamSpecArgs,
+        json_schema_name: str = None,
+        **kwargs: ParamSpecKwargs,
+    ) -> None:
+        super().__init__(*args, **kwargs)
+        self.json_schema_name = json_schema_name
+        self.__name__ = json_schema_name
+
+
+class CustomJsonSchema(JSONSchema):
+    @post_dump
+    def wrap(self, data: dict, **_) -> dict[str, Any]:
+        """Wrap this with the root schema definitions."""
+        if self.nested:  # no need to wrap, will be in outer defs
+            return data
+
+        schema_name = self.obj.json_schema_name
+
+        data["additionalProperties"] = False
+
+        self._nested_schema_classes[schema_name] = data
+        root = {
+            "$schema": "http://json-schema.org/draft-07/schema#",
+            "definitions": self._nested_schema_classes,
+            "$ref": f"#/definitions/{schema_name}",
+        }
+        return root

martin_eden/core.py

@@ -1,8 +1,3 @@
-from typing import ParamSpecArgs, ParamSpecKwargs
-
-from marshmallow import Schema
-from marshmallow.decorators import post_dump
-from marshmallow_jsonschema import JSONSchema
 
 import asyncio
 import dataclasses
@@ -19,58 +14,16 @@
 from martin_eden.openapi import OpenApiBuilder
 from martin_eden.routing import ControllerDefinitionError, get_controller, register_route
 from martin_eden.utils import get_argument_names
+from martin_eden.base import Controller
 
 db = DataBase()
 
+
 @register_route('/schema/', 'get')
 async def get_openapi_schema() -> str:
     return json.dumps(OpenApiBuilder().openapi_object)
 
 
-class Controller:
-    """The class needs only as type hint"""
-    request_schema: Schema
-    response_schema: Schema
-    query_params: dict
-
-    def __call__(
-        self, *args: ParamSpecArgs, **kwargs: ParamSpecKwargs,
-    ) -> None:
-        pass
-
-
-class CustomSchema(Schema):
-    def __init__(
-        self,
-        *args: ParamSpecArgs,
-        json_schema_name: str = None,
-        **kwargs: ParamSpecKwargs,
-    ) -> None:
-        super().__init__(*args, **kwargs)
-        self.json_schema_name = json_schema_name
-        self.__name__ = json_schema_name
-
-
-class CustomJsonSchema(JSONSchema):
-    @post_dump
-    def wrap(self, data: dict, **_) -> dict[str, Any]:
-        """Wrap this with the root schema definitions."""
-        if self.nested:  # no need to wrap, will be in outer defs
-            return data
-
-        schema_name = self.obj.json_schema_name
-
-        data["additionalProperties"] = False
-
-        self._nested_schema_classes[schema_name] = data
-        root = {
-            "$schema": "http://json-schema.org/draft-07/schema#",
-            "definitions": self._nested_schema_classes,
-            "$ref": f"#/definitions/{schema_name}",
-        }
-        return root
-
-
 class HttpRequestHandler:
     def __init__(
         self, event_loop: AbstractEventLoop, client_socket: socket.socket,

martin_eden/database.py

@@ -13,7 +13,7 @@
 )
 from sqlalchemy.orm import DeclarativeBase
 
-from martin_eden.core import CustomSchema
+from martin_eden.base import CustomSchema
 from martin_eden.utils import (
     get_name_of_model,
     get_python_field_type_from_alchemy_field,

martin_eden/openapi.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from martin_eden.core import CustomJsonSchema, CustomSchema
+from martin_eden.base import CustomJsonSchema, CustomSchema
 from martin_eden.utils import (
     dict_set,
     get_name_of_model,

martin_eden/routing.py

@@ -1,6 +1,6 @@
 from typing import Callable, ParamSpecArgs, ParamSpecKwargs
 
-from martin_eden.core import Controller, CustomSchema
+from martin_eden.base import Controller, CustomSchema
 from martin_eden.openapi import OpenApiBuilder
 
 DictOfRoutes = dict[str, dict[str, Controller]]