pkn 0.1.1__tar.gz → 0.1.3__tar.gz

{pkn-0.1.1 → pkn-0.1.3}/PKG-INFO

@@ -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.1 → pkn-0.1.3}/pkn/__init__.py

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

pkn-0.1.3/pkn/pydantic/__init__.py

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

pkn-0.1.3/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-0.1.1 → pkn-0.1.3}/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-0.1.3/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-0.1.1 → pkn-0.1.3}/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 → pkn-0.1.3}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [{name = "the pkn authors", email = "t.paine154@gmail.com"}]
 description = "My Pocket Knife"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-version = "0.1.1"
+version = "0.1.3"
 requires-python = ">=3.9"
 keywords = []
 
@@ -50,7 +50,7 @@ Repository = "https://github.com/1kbgz/pkn"
 Homepage = "https://github.com/1kbgz/pkn"
 
 [tool.bumpversion]
-current_version = "0.1.1"
+current_version = "0.1.3"
 commit = true
 tag = true
 
@@ -101,7 +101,6 @@ packages = ["pkn"]
 
 [tool.pytest.ini_options]
 addopts = ["-vvv", "--junitxml=junit.xml"]
-asyncio_mode = "strict"
 testpaths = "pkn/tests"
 
 [tool.ruff]

pkn-0.1.1/pkn/pydantic/__init__.py

@@ -1 +0,0 @@
-from .roots import *