pkn 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

pkn/__init__.py

@@ -1,3 +1,3 @@
 from .pydantic import *
 
-__version__ = "0.1.1"
+__version__ = "0.1.3"

pkn/pydantic/__init__.py

@@ -1 +1,3 @@
+from .generic import *
+from .paths import *
 from .roots import *

pkn/pydantic/paths.py

@@ -0,0 +1,41 @@
+from importlib import import_module
+from types import FunctionType, MethodType
+from typing import Annotated, Optional
+
+from pydantic import BeforeValidator, PlainSerializer
+
+__all__ = (
+    "get_import_path",
+    "serialize_path_as_string",
+    "ImportPath",
+    "CallablePath",
+)
+
+
+def get_import_path(path: str) -> type:
+    if isinstance(path, type):
+        return path
+    elif isinstance(path, (FunctionType, MethodType)):
+        return path
+    if not isinstance(path, str):
+        raise TypeError(path)
+    module, call = path.rsplit(".", 1)
+    return getattr(import_module(module), call)
+
+
+def serialize_path_as_string(value: type) -> Optional[str]:
+    if value is None:
+        return None
+    if hasattr(value, "__module__") and hasattr(value, "__qualname__"):
+        return f"{value.__module__}.{value.__qualname__}"
+    if hasattr(value, "__name__"):
+        return f"{value.__module__}.{value.__name__}"
+    if hasattr(value, "__class__") and hasattr(value.__class__, "__name__"):
+        return f"{value.__class__.__module__}.{value.__class__.__name__}"
+    if hasattr(value, "__class__") and hasattr(value.__class__, "__qualname__"):
+        return f"{value.__class__.__module__}.{value.__class__.__qualname__}"
+    raise TypeError(f"Could not derive module and name for {value}")
+
+
+ImportPath = Annotated[type, BeforeValidator(get_import_path), PlainSerializer(serialize_path_as_string, when_used="json", return_type=str)]
+CallablePath = Annotated[object, BeforeValidator(get_import_path), PlainSerializer(serialize_path_as_string, when_used="json", return_type=str)]

pkn/pydantic/roots.py

@@ -1,12 +1,12 @@
-from typing import Dict as DictType, List as ListType
+from typing import Dict as DictType, List as ListType, Optional, Union
 
-from pydantic import BaseModel, RootModel
+from pydantic import BaseModel, Field, RootModel
 
 __all__ = ("Dict", "List")
 
 
 class Dict(RootModel):
-    root: DictType[str, BaseModel]
+    root: Optional[DictType[str, Optional[Union[BaseModel, "Dict", "List", int, float, str]]]] = Field(default_factory=dict)
 
     def __iter__(self):
         return iter(self.root)
@@ -46,7 +46,7 @@ class Dict(RootModel):
 
 
 class List(RootModel):
-    root: ListType[BaseModel]
+    root: Optional[ListType[Union[BaseModel, "Dict", "List", int, float, str]]] = Field(default_factory=list)
 
     def __iter__(self):
         return iter(self.root)

pkn/tests/pydantic/test_paths.py

@@ -0,0 +1,27 @@
+from pydantic import BaseModel
+
+from pkn.pydantic import CallablePath, ImportPath
+
+
+def foo():
+    return "foo"
+
+
+class MyType(int): ...
+
+
+class MyModel(BaseModel):
+    typ: ImportPath
+    foo: CallablePath
+
+
+def test_get_import_path_inst():
+    m = MyModel(typ=MyType, foo=foo)
+    assert m.typ == MyType
+    assert m.foo == foo
+
+
+def test_get_import_path_string():
+    m = MyModel(typ="pkn.tests.pydantic.test_paths.MyType", foo="pkn.tests.pydantic.test_paths.foo")
+    assert m.typ(1) == MyType(1)
+    assert m.foo() == foo()

pkn/tests/pydantic/test_roots.py

@@ -27,6 +27,10 @@ class TestPydanticRoots:
         assert "a" not in d
         assert "b" not in d
 
+    def test_dict_types(self):
+        d = Dict({"a": MyModel(a=1, b="b"), "b": "abc", "c": 1, "d": 1.2, "e": List(), "f": Dict(), "g": None})
+        assert len(d) == 7
+
     def test_list(self):
         lst = List([MyModel(a=1, b="b"), MyModel(a=2, b="c")])
         assert len(lst) == 2
@@ -37,3 +41,7 @@ class TestPydanticRoots:
         del lst[0]
         assert len(lst) == 1
         assert lst[0] == MyModel(a=2, b="c")
+
+    def test_list_types(self):
+        d = List([MyModel(a=1, b="b"), "abc", 1, 1.2, List(), Dict(), None])
+        assert len(d) == 7

{pkn-0.1.1.dist-info → pkn-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pkn
-Version: 0.1.1
+Version: 0.1.3
 Summary: My Pocket Knife
 Project-URL: Repository, https://github.com/1kbgz/pkn
 Project-URL: Homepage, https://github.com/1kbgz/pkn

pkn-0.1.3.dist-info/RECORD

@@ -0,0 +1,19 @@
+pkn/__init__.py,sha256=tmrbhNq_zFJpjNhdW2g9_SkGXeOQ-iBLSjmwdkXMiXk,47
+pkn/infra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pkn/infra/at.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pkn/infra/common.py,sha256=Ymsc6F60EUJoCxGNUbj2xQ4OwsVh5IwcOXFnn_mRGYE,744
+pkn/infra/journalctl.py,sha256=ZbmEAcqJG3IoLUTy8Uwkx341ga0t-56SXl4Wa-ls1DY,287
+pkn/infra/launchctl.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pkn/infra/reboot.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pkn/infra/systemctl.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pkn/pydantic/__init__.py,sha256=KQVHgirlymnu4lpOW_MxxfchnE2c2A_f9xGdS4UxAIc,65
+pkn/pydantic/generic.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pkn/pydantic/paths.py,sha256=aQ5kfYVjtVQrSbE9wJ0cCMqWFNM81V8ivTkLa6kLypU,1590
+pkn/pydantic/roots.py,sha256=2jt5fbGGMDu7kEi6EYci21FFkLwxtEse1ldrAehTYyw,2575
+pkn/tests/test_all.py,sha256=7jewXmZqf4xpkDjN1yc17oxTCHQIlxqWqgmm_l96kSI,60
+pkn/tests/pydantic/test_paths.py,sha256=3w8tZgSgVnDMXUGG86OvSnPhtmimHutnGrQJy5hoqqQ,529
+pkn/tests/pydantic/test_roots.py,sha256=uNfzA5jqIDK8WVD-yIJdwTJOdec7HwmCwI677rbi86I,1377
+pkn-0.1.3.dist-info/METADATA,sha256=owb6aZ7lvYCCsQxPM5msraOknguWukRQNppH4rXq_98,2036
+pkn-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pkn-0.1.3.dist-info/licenses/LICENSE,sha256=88kGYCLkpYJl18wjFE_ggvtjqnPAm2zhiIgX12fG_ug,11345
+pkn-0.1.3.dist-info/RECORD,,

pkn-0.1.1.dist-info/RECORD

@@ -1,17 +0,0 @@
-pkn/__init__.py,sha256=LDeokQfuV7SMJPfgn26xXrP5MYrsLrhhutyNp1D1XA8,47
-pkn/infra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pkn/infra/at.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pkn/infra/common.py,sha256=Ymsc6F60EUJoCxGNUbj2xQ4OwsVh5IwcOXFnn_mRGYE,744
-pkn/infra/journalctl.py,sha256=ZbmEAcqJG3IoLUTy8Uwkx341ga0t-56SXl4Wa-ls1DY,287
-pkn/infra/launchctl.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pkn/infra/reboot.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pkn/infra/systemctl.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pkn/pydantic/__init__.py,sha256=M-lKT4BNEjAX0098TvC4U8CVnDTn4smN-fkMK9haopM,21
-pkn/pydantic/generic.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pkn/pydantic/roots.py,sha256=CWB6yrk75KB1MQnrfapG-C1M3IZE97HgQxN0ttuUIgE,2381
-pkn/tests/test_all.py,sha256=7jewXmZqf4xpkDjN1yc17oxTCHQIlxqWqgmm_l96kSI,60
-pkn/tests/pydantic/test_roots.py,sha256=aX8TU00DTurUX7kal4LXeJKGhzF2TQiCs7lCEsYL-eo,1070
-pkn-0.1.1.dist-info/METADATA,sha256=3gAiQmI1u5KgSLqmrT6dxIW5FLOeHEYxC1mi8B0NP4s,2036
-pkn-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pkn-0.1.1.dist-info/licenses/LICENSE,sha256=88kGYCLkpYJl18wjFE_ggvtjqnPAm2zhiIgX12fG_ug,11345
-pkn-0.1.1.dist-info/RECORD,,