ominfra 0.0.0.dev315__py3-none-any.whl → 0.0.0.dev488__py3-none-any.whl

ominfra/clouds/aws/models/gen/cli.py

@@ -86,7 +86,8 @@ class Cli(ap.Cli):
         fn = svc.name
         if fn in keyword.kwlist:
             fn += '_'
-        output_file = os.path.join(output_dir, f'{fn}.py')
+        output_file = os.path.join(output_dir, fn, '__init__.py')
+        os.makedirs(os.path.dirname(output_file), exist_ok=True)
         with open(output_file, 'w') as f:
             f.write(mod)
 

ominfra/clouds/aws/models/gen/gen.py

@@ -17,7 +17,7 @@ from omlish.lite.strings import snake_case
 
 if ta.TYPE_CHECKING:
     import botocore.loaders
-    import botocore.mode2
+    import botocore.model
     import botocore.session
 else:
     botocore = lang.proxy_import('botocore', extras=[
@@ -175,10 +175,13 @@ class ModelGen:
 
     def get_type_ann(
             self,
-            name: str,
+            name: str | None,
             *,
             unquoted_names: bool = False,
     ) -> str | None:
+        if name is None:
+            return None
+
         try:
             return self.BASE_TYPE_ANNS[name]
         except KeyError:
@@ -300,7 +303,13 @@ class ModelGen:
         '',
         'from omlish import dataclasses as _dc  # noqa',
         '',
-        'from .. import base as _base  # noqa',
+        'from ... import base as _base  # noqa',
+        '',
+        '',
+        '_dc.init_package(',
+        '    globals(),',
+        '    codegen=True,',
+        ')',
         '',
         '',
         '##',
@@ -434,17 +443,17 @@ class ModelGen:
         elif isinstance(shape, botocore.model.MapShape):
             # shape.key, shape.value
             kn = shape.key.name
-            ka = self.get_type_ann(
+            ka2 = self.get_type_ann(
                 kn,
                 unquoted_names=unquoted_names,
             )
             vn = shape.key.name
-            va = self.get_type_ann(
+            va2 = self.get_type_ann(
                 vn,
                 unquoted_names=unquoted_names,
             )
-            l = f'{san_name}: _ta.TypeAlias = _ta.Mapping[{ka or kn}, {va or vn}]'
-            if ka is None or va is None:
+            l = f'{san_name}: _ta.TypeAlias = _ta.Mapping[{ka2 or kn}, {va2 or vn}]'
+            if ka2 is None or va2 is None:
                 l = '# ' + l
             return self.ShapeSrc(l)