cc chaotic: do not import types, only modules

commit_hash:0af1f4eb5e5009957b04d3e7b46405d50e6556ec

Author: segoon

chaotic-openapi/chaotic_openapi/back/cpp_client/output.py

@@ -9,7 +9,7 @@
 from chaotic.back.cpp import types as cpp_types
 from chaotic.front import parser as chaotic_parser
 from chaotic.front import ref
-from . import renderer
+from chaotic_openapi.back.cpp_client import renderer
 
 TYPES_INCLUDES = [
     'cstdint',

chaotic-openapi/chaotic_openapi/back/cpp_client/types.py

@@ -4,7 +4,7 @@
 from chaotic import cpp_names
 from chaotic import error
 from chaotic.back.cpp import types as cpp_types
-from . import middleware
+from chaotic_openapi.back.cpp_client import middleware
 
 
 @dataclasses.dataclass

chaotic-openapi/chaotic_openapi/back/linter/__main__.py

@@ -4,8 +4,8 @@
 
 import yaml
 
+from chaotic_openapi.back.linter import validators
 from chaotic_openapi.front import parser as front_parser
-from . import validators
 
 
 def parse_args():

chaotic-openapi/chaotic_openapi/front/model.py

@@ -4,7 +4,7 @@
 from typing import Any
 
 from chaotic.front import types
-from . import base_model
+from chaotic_openapi.front import base_model
 
 
 class In(str, enum.Enum):

chaotic-openapi/chaotic_openapi/front/openapi.py

@@ -3,8 +3,8 @@
 
 import pydantic
 
-from . import base_model
-from . import errors
+from chaotic_openapi.front import base_model
+from chaotic_openapi.front import errors
 
 
 # https://spec.openapis.org/oas/v3.0.0.html#info-object

chaotic-openapi/chaotic_openapi/front/parser.py

@@ -10,12 +10,12 @@
 from chaotic.front import parser as chaotic_parser
 from chaotic.front import ref
 from chaotic.front import types
-from . import base_model
-from . import errors
-from . import model
-from . import openapi
-from . import ref_resolver
-from . import swagger
+from chaotic_openapi.front import base_model
+from chaotic_openapi.front import errors
+from chaotic_openapi.front import model
+from chaotic_openapi.front import openapi
+from chaotic_openapi.front import ref_resolver
+from chaotic_openapi.front import swagger
 
 
 @dataclasses.dataclass

chaotic-openapi/chaotic_openapi/front/swagger.py

@@ -3,8 +3,8 @@
 
 import pydantic
 
-from . import base_model
-from . import errors
+from chaotic_openapi.front import base_model
+from chaotic_openapi.front import errors
 
 
 class Info(base_model.BaseModel):

chaotic/chaotic/compilers/dynamic_config.py

@@ -9,14 +9,12 @@
 
 from chaotic import cpp_format
 from chaotic import cpp_names
+from chaotic import main
 from chaotic.back.cpp import renderer
 from chaotic.back.cpp import translator
-from chaotic.back.cpp import types
+from chaotic.back.cpp import types as cpp_types
 from chaotic.front import ref
-from chaotic.front.types import ResolvedSchemas
-from chaotic.main import generate_cpp_name_func
-from chaotic.main import NameMapItem
-from chaotic.main import read_schemas
+from chaotic.front import types as front_types
 
 INCLUDE_DIRS = [
     str(pathlib.Path(__file__).parent.parent.parent / 'include'),
@@ -80,10 +78,10 @@ def enrich_jinja_env(env: jinja2.Environment) -> None:
 
 class CompilerBase:
     def __init__(self) -> None:
-        self._variables_types: dict[str, dict[str, types.CppType]] = {}
+        self._variables_types: dict[str, dict[str, cpp_types.CppType]] = {}
         self._definitions: dict[
             str,
-            tuple[ResolvedSchemas, dict[str, types.CppType]],
+            tuple[front_types.ResolvedSchemas, dict[str, cpp_types.CppType]],
         ] = {}
         self._defaults: dict[str, Any] = {}
         self.seen_includes: dict[str, set[str]] = {}
@@ -114,14 +112,14 @@ def _extract_definition_names(self, content: Any) -> list[str]:
 
         return []
 
-    def extract_variable_type(self) -> types.CppType:
+    def extract_variable_type(self) -> cpp_types.CppType:
         keys = list(self._variables_types.keys())
         assert len(keys) == 1
         name = keys[0]
 
         name_lower = self.format_ns_name(name)
-        types = self._variables_types[name]
-        return types[f'::taxi_config::{name_lower}::VariableTypeRaw']
+        var_types = self._variables_types[name]
+        return var_types[f'::taxi_config::{name_lower}::VariableTypeRaw']
 
     def format_ns_name(self, name: str) -> str:
         return name.lower().replace('/', '_').replace('-', '_').split('.')[0]
@@ -133,7 +131,7 @@ def parse_definition(
         include_dirs: list[str] = [],
     ) -> None:
         name_lower = self.format_ns_name(name)
-        name_map = [NameMapItem('/([^/]+)/={0}')]
+        name_map = [main.NameMapItem('/([^/]+)/={0}')]
         # fname = f'taxi_config/definitions/{name}'
         fname = f'{name}'
 
@@ -172,9 +170,9 @@ def parse_variable(
         name_lower = self.format_ns_name(name)
         name_map = [
             # Variable type
-            NameMapItem('/schema/=VariableTypeRaw'),
+            main.NameMapItem('/schema/=VariableTypeRaw'),
             # Aux. types
-            NameMapItem('/schema/definitions/([^/]+)/={0}'),
+            main.NameMapItem('/schema/definitions/([^/]+)/={0}'),
         ]
         # The virtual name is used for generated filepath identification
         # fname = f'taxi_config/variables/{name}.types.yaml'
@@ -193,13 +191,13 @@ def parse_variable(
         self._defaults[name] = self._read_default(filepath)
         self.seen_includes[filepath] = seen_includes
 
-    def _collect_schemas(self) -> list[ResolvedSchemas]:
+    def _collect_schemas(self) -> list[front_types.ResolvedSchemas]:
         schemas = []
         for def_schemas, _definitions in self._definitions.values():
             schemas.append(def_schemas)
         return schemas
 
-    def _collect_types(self) -> dict[str, types.CppType]:
+    def _collect_types(self) -> dict[str, cpp_types.CppType]:
         types = {}
         for _def_schemas, definitions in self._definitions.values():
             types.update(definitions)
@@ -213,15 +211,15 @@ def _generate_types(
         name_map,
         fname: str,
         include_dirs: list[str],
-    ) -> tuple[ResolvedSchemas, dict[str, types.CppType], set[str]]:
-        schemas = read_schemas(
+    ) -> tuple[front_types.ResolvedSchemas, dict[str, cpp_types.CppType], set[str]]:
+        schemas = main.read_schemas(
             erase_path_prefix=erase_prefix,
             filepaths=[filepath],
             name_map=name_map,
-            file_map=[NameMapItem(escape_re_pattern(filepath) + '=' + fname)],
+            file_map=[main.NameMapItem(escape_re_pattern(filepath) + '=' + fname)],
             dependencies=self._collect_schemas(),
         )
-        cpp_name_func = generate_cpp_name_func(
+        cpp_name_func = main.generate_cpp_name_func(
             name_map=name_map,
             erase_prefix=erase_prefix,
         )
@@ -273,7 +271,7 @@ def _jinja(self) -> jinja2.Environment:
 
     def create_aliases(
         self,
-        types: dict[str, types.CppType],
+        types: dict[str, cpp_types.CppType],
     ) -> list[tuple[str, str]]:
         return []
 

chaotic/chaotic/cpp_names.py

@@ -1,4 +1,4 @@
-from . import cpp_keywords
+from chaotic import cpp_keywords
 
 
 def camel_case(string: str, no_lower_casing: bool = False) -> str:

chaotic/chaotic/front/types.py

@@ -8,7 +8,7 @@
 import pydantic
 
 from chaotic import error
-from . import base_model
+from chaotic.front import base_model
 
 
 class FieldError(Exception):