iker-python-common 1.0.35__tar.gz → 1.0.37__tar.gz

{iker_python_common-1.0.35 → iker_python_common-1.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.35
+Version: 1.0.37
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{iker_python_common-1.0.35 → iker_python_common-1.0.37}/src/iker/common/utils/argutils.py

@@ -1,7 +1,8 @@
 import argparse
+import dataclasses
 import inspect
+import typing
 from collections.abc import Sequence
-from dataclasses import dataclass
 from typing import Any
 
 from iker.common.utils.typeutils import is_identical_type, type_origin
@@ -90,17 +91,29 @@ class ParserTree(object):
         return list(command for _, command in sorted(command_pairs)), namespace
 
 
-@dataclass(frozen=True)
+@dataclasses.dataclass(frozen=True)
 class ArgParseSpec(object):
     flag: str | None = None
     name: str | None = None
     action: str | None = None
     default: Any = None
-    type: type = None
+    type: typing.Type | None = None
     choices: list[Any] | None = None
     required: bool | None = None
     help: str | None = None
 
+    def make_kwargs(self) -> dict[str, Any]:
+        kwargs = dict(
+            action=self.action,
+            default=self.default,
+            type=self.type,
+            choices=self.choices,
+            required=self.required,
+            help=self.help,
+        )
+
+        return {key: value for key, value in kwargs.items() if value is not None}
+
 
 argparse_spec = ArgParseSpec
 
@@ -115,53 +128,41 @@ def make_argparse(func, parser: argparse.ArgumentParser = None) -> argparse.Argu
     sig = inspect.signature(func)
     for name, param in sig.parameters.items():
 
+        arg_name = f"--{name.replace('_', '-')}"
+
         if param.annotation is None:
-            param_type = str
+            arg_type = str
         elif is_type_of(param.annotation, str, str | None, list[str], Sequence[str]):
-            param_type = str
+            arg_type = str
         elif is_type_of(param.annotation, int, int | None, list[int], Sequence[int]):
-            param_type = int
+            arg_type = int
         elif is_type_of(param.annotation, float, float | None, list[float], Sequence[float]):
-            param_type = float
+            arg_type = float
         elif is_type_of(param.annotation, bool, bool | None, list[bool], Sequence[bool]):
-            param_type = bool
+            arg_type = bool
         else:
-            param_type = str
+            arg_type = str
 
-        param_action = "append" if type_origin(param.annotation) in {list, Sequence} else None
-        param_default = None if param.default is inspect.Parameter.empty else param.default
+        arg_action = "append" if type_origin(param.annotation) in {list, Sequence} else None
+        arg_default = None if param.default is inspect.Parameter.empty else param.default
 
-        if not isinstance(param_default, ArgParseSpec):
-            param_name = f"--{name.replace('_', '-')}"
+        if isinstance(arg_default, ArgParseSpec):
+            spec = arg_default
+            spec = dataclasses.replace(spec,
+                                       name=spec.name or arg_name,
+                                       type=spec.type if spec.type is not None else arg_type,
+                                       action=spec.action if spec.action is not None else arg_action)
 
-            parser.add_argument(param_name,
-                                type=param_type,
-                                action=param_action,
-                                required=param_default is None,
-                                default=param_default)
+            if spec.flag is None:
+                parser.add_argument(spec.name, **spec.make_kwargs())
+            else:
+                parser.add_argument(spec.flag, spec.name, **spec.make_kwargs())
 
         else:
-            spec = param_default
-
-            param_flag = spec.flag
-            param_name = spec.name or f"--{name.replace('_', '-')}"
-            param_type = spec.type if spec.type is not None else param_type
-            param_action = spec.action if spec.action is not None else param_action
-
-            if param_flag is None:
-                parser.add_argument(param_name,
-                                    type=param_type,
-                                    action=param_action,
-                                    required=spec.default is None,
-                                    default=spec.default,
-                                    help=spec.help)
-            else:
-                parser.add_argument(param_flag,
-                                    param_name,
-                                    type=param_type,
-                                    action=param_action,
-                                    required=spec.default is None,
-                                    default=spec.default,
-                                    help=spec.help)
+            parser.add_argument(arg_name,
+                                type=arg_type,
+                                action=arg_action,
+                                required=arg_default is None,
+                                default=arg_default)
 
     return parser

{iker_python_common-1.0.35 → iker_python_common-1.0.37}/src/iker/common/utils/dockerutils.py

@@ -1,7 +1,7 @@
 import contextlib
+import dataclasses
 import re
 from collections.abc import Generator, Iterator
-from dataclasses import dataclass
 from typing import Any
 
 import docker
@@ -24,7 +24,7 @@ __all__ = [
 ]
 
 
-@dataclass
+@dataclasses.dataclass
 class ImageName(object):
     registry_host: str | None
     registry_port: int | None

{iker_python_common-1.0.35 → iker_python_common-1.0.37}/src/iker/common/utils/retry.py

@@ -1,8 +1,7 @@
+import abc
 import datetime
 import random
 import time
-from abc import ABC
-from abc import abstractmethod
 
 from iker.common.utils import logger
 
@@ -44,8 +43,8 @@ class Attempt(object):
         self.last_exception = last_exception
 
 
-class Retry(ABC):
-    @abstractmethod
+class Retry(abc.ABC):
+    @abc.abstractmethod
     def on_attempt(self, attempt: Attempt):
         """
         Updates the retry state on attempt
@@ -54,7 +53,7 @@ class Retry(ABC):
         """
         pass
 
-    @abstractmethod
+    @abc.abstractmethod
     def execute(self, *args, **kwargs):
         pass
 

{iker_python_common-1.0.35 → iker_python_common-1.0.37}/src/iker/common/utils/s3utils.py

@@ -1,10 +1,10 @@
 import concurrent.futures
 import contextlib
+import dataclasses
 import datetime
 import mimetypes
 import os
 import tempfile
-from dataclasses import dataclass
 
 import boto3
 from botocore.client import BaseClient
@@ -26,7 +26,7 @@ __all__ = [
 ]
 
 
-@dataclass
+@dataclasses.dataclass
 class S3ObjectMeta(object):
     key: str
     last_modified: datetime.datetime

{iker_python_common-1.0.35 → iker_python_common-1.0.37}/src/iker/common/utils/testutils.py

@@ -1,5 +1,5 @@
+import abc
 import os
-from abc import ABC
 from decimal import Decimal
 from typing import Any, Protocol
 
@@ -83,7 +83,7 @@ class MockedCallable(Protocol):
     def __call__(self, *args, **kwargs) -> None: ...
 
 
-class CalleeMock(ABC):
+class CalleeMock(abc.ABC):
 
     def __init__(self, valuer: MockedCallable | Any):
         self.calls = []

{iker_python_common-1.0.35 → iker_python_common-1.0.37}/src/iker_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iker-python-common
-Version: 1.0.35
+Version: 1.0.37
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12