ominfra 0.0.0.dev206__py3-none-any.whl → 0.0.0.dev208__py3-none-any.whl

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

@@ -4,6 +4,7 @@ import os.path
 import sys
 import typing as ta
 
+from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
@@ -30,14 +31,17 @@ class Cli(ap.Cli):
     ) -> str:
         service_model = ModelGen.load_service_model(service_name)
 
+        shape_names_seq = check.unique(shape_names or ())
+        operation_names_seq = check.unique(operation_names or ())
+
         bmg = ModelGen(
             service_model,
             shape_names=ModelGen.get_referenced_shape_names(
                 service_model,
-                shape_names=shape_names or (),
-                operation_names=operation_names or (),
+                shape_names=shape_names_seq,
+                operation_names=operation_names_seq,
             ),
-            operation_names=operation_names or (),
+            operation_names=operation_names_seq,
         )
 
         return bmg.gen_module()

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

@@ -6,6 +6,7 @@ TODO:
 import builtins
 import dataclasses as dc
 import io
+import keyword
 import typing as ta
 
 from omlish import check
@@ -156,6 +157,7 @@ class ModelGen:
         'Boolean': 'bool',
 
         'Integer': 'int',
+        'Long': 'int',
 
         'String': 'str',
 
@@ -181,7 +183,7 @@ class ModelGen:
             pass
 
         if name in self._shape_names:
-            name = self.sanitize_class_name(name)
+            name = self.sanitize_global_name(name, upper=True)
             if not unquoted_names:
                 return f"'{name}'"
             else:
@@ -248,10 +250,17 @@ class ModelGen:
 
     #
 
-    def sanitize_class_name(self, n: str) -> str:
+    def sanitize_local_name(self, n: str) -> str:
+        if n in keyword.kwlist:
+            n += '_'
+        return n
+
+    def sanitize_global_name(self, n: str, *, upper: bool = False) -> str:
         if hasattr(builtins, n):
             n += '_'
-        return n[0].upper() + n[1:]
+        if upper:
+            n = n[0].upper() + n[1:]
+        return n
 
     #
 
@@ -291,7 +300,7 @@ class ModelGen:
     ) -> ShapeSrc:
         shape: botocore.model.Shape = self._service_model.shape_for(name)
 
-        san_name = self.sanitize_class_name(shape.name)
+        san_name = self.sanitize_global_name(shape.name, upper=True)
 
         if isinstance(shape, botocore.model.StructureShape):
             lines: list[str] = []
@@ -314,7 +323,7 @@ class ModelGen:
             for i, (mn, ms) in enumerate(shape.members.items()):
                 if i:
                     lines.append('')
-                fn = self.demangle_name(mn)
+                fn = self.sanitize_local_name(self.demangle_name(mn))
                 mds = [
                     f'member_name={mn!r}',
                 ]