pkl-python 0.1.12__tar.gz → 0.1.13__tar.gz

{pkl-python-0.1.12 → pkl-python-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pkl-python
-Version: 0.1.12
+Version: 0.1.13
 Summary: Python library for Apple's PKL.
 Author-email: Jungwoo Yang <jwyang0213@gmail.com>
 License: MIT License
@@ -25,9 +25,9 @@ License: MIT License
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
         
-Project-URL: Homepage, https://github.com/jw-y/pkl
-Project-URL: Bug Reports, https://github.com/jw-y/pkl/issues
-Project-URL: Source, https://github.com/jw-y/pkl
+Project-URL: Homepage, https://github.com/jw-y/pkl-python
+Project-URL: Bug Reports, https://github.com/jw-y/pkl-python/issues
+Project-URL: Source, https://github.com/jw-y/pkl-python
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -68,21 +68,26 @@ Here's how you can start using `pkl-python` to load a PKL module:
 import pkl
 
 config = pkl.load("path/to/pkl/example_module.pkl")
-print(config)
+```
+
+### Code Generation
+As Python is a dynamic language, codegen is not strictly necessary.
+However, codegen lets you expect contents of pkl files within Python modules.
+
+```
+pkl-gen-python path/to/pkl/example_module.pkl
 ```
 
 ### Status
-* Evaluator API: fully functional
-* Code Generation: in development
+* Evaluator API: functional
+* Code Generation: functional, but needs refining
 
 ### TODO
-* [ ] (codgen) pip binary installation
-* [ ] (codgen) fix class order
+* [x] (codgen) pip binary installation
+* [ ] (codgen) gatherer depth-first ordering
 * [ ] (codgen) clean up code
 
 
-## Usage
-
 ## Advanced Features
 For details on the parameters, refer [Message Passing API](https://pkl-lang.org/main/current/bindings-specification/message-passing-api.html).
 

{pkl-python-0.1.12 → pkl-python-0.1.13}/README.md

@@ -21,21 +21,26 @@ Here's how you can start using `pkl-python` to load a PKL module:
 import pkl
 
 config = pkl.load("path/to/pkl/example_module.pkl")
-print(config)
+```
+
+### Code Generation
+As Python is a dynamic language, codegen is not strictly necessary.
+However, codegen lets you expect contents of pkl files within Python modules.
+
+```
+pkl-gen-python path/to/pkl/example_module.pkl
 ```
 
 ### Status
-* Evaluator API: fully functional
-* Code Generation: in development
+* Evaluator API: functional
+* Code Generation: functional, but needs refining
 
 ### TODO
-* [ ] (codgen) pip binary installation
-* [ ] (codgen) fix class order
+* [x] (codgen) pip binary installation
+* [ ] (codgen) gatherer depth-first ordering
 * [ ] (codgen) clean up code
 
 
-## Usage
-
 ## Advanced Features
 For details on the parameters, refer [Message Passing API](https://pkl-lang.org/main/current/bindings-specification/message-passing-api.html).
 

{pkl-python-0.1.12 → pkl-python-0.1.13}/pyproject.toml

@@ -18,14 +18,14 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "msgpack >= 1.0.8"
+    "msgpack >= 1.0.8",
 ]
 
 [tool.setuptools.packages.find]
-include = ["pkl"]
+where = ["src"]
 
 [tool.setuptools.dynamic]
-version = {file = "pkl/VERSION"}
+version = {file = "src/pkl/VERSION"}
 
 [project.optional-dependencies]
 dev = [
@@ -40,9 +40,12 @@ dev = [
 ]
 
 [project.urls]
-"Homepage" = "https://github.com/jw-y/pkl"
-"Bug Reports" = "https://github.com/jw-y/pkl/issues"
-"Source" = "https://github.com/jw-y/pkl"
+"Homepage" = "https://github.com/jw-y/pkl-python"
+"Bug Reports" = "https://github.com/jw-y/pkl-python/issues"
+"Source" = "https://github.com/jw-y/pkl-python"
+
+[project.scripts]
+pkl-gen-python = "pkl_gen_python:main"
 
 [tool.twine]
 repository = "pypi"
@@ -50,9 +53,14 @@ repository = "pypi"
 [tool.black]
 line-length = 88
 target-version = ['py310']
+force-exclude = 'codegen/snippet-tests/output/'
 
 [tool.isort]
 profile = "black"
+skip = ["codegen/snippet-tests/output/*"]
+
+[tool.autoflake]
+exclude = ["codegen/snippet-tests/output/*"]
 
 [tool.pytest.ini_options]
 addopts = "-ra -q"

pkl-python-0.1.13/src/pkl/VERSION

@@ -0,0 +1 @@
+0.1.13

{pkl-python-0.1.12 → pkl-python-0.1.13/src}/pkl/__init__.py

@@ -34,6 +34,21 @@ def _search_project_dir(module_path: str) -> str:
     return str(cur_path.absolute())
 
 
+def _parse_module_uri(module_uri, module_text):
+    parsed = urlparse(str(module_uri))
+
+    def is_uri(_uri: ParseResult):
+        return bool(_uri.scheme) and (bool(_uri.netloc) or bool(_uri.path))
+
+    if module_text:
+        source = ModuleSource.from_text(module_text)
+    elif is_uri(parsed):
+        source = ModuleSource.from_uri(module_uri)
+    else:
+        source = ModuleSource.from_path(module_uri)
+    return source
+
+
 def load(
     module_uri: Union[str, Path],
     *,
@@ -71,17 +86,7 @@ def load(
     environmental configurations, and support for complex project dependencies.
     """
 
-    parsed = urlparse(str(module_uri))
-
-    def is_uri(_uri: ParseResult):
-        return bool(_uri.scheme) and (bool(_uri.netloc) or bool(_uri.path))
-
-    if module_text:
-        source = ModuleSource.from_text(module_text)
-    elif is_uri(parsed):
-        source = ModuleSource.from_uri(module_uri)
-    else:
-        source = ModuleSource.from_path(module_uri)
+    source = _parse_module_uri(module_uri, module_text)
 
     if project_dir is PKL_DEFAULT:
         project_dir = _search_project_dir(str(module_uri))

{pkl-python-0.1.12 → pkl-python-0.1.13/src}/pkl_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pkl-python
-Version: 0.1.12
+Version: 0.1.13
 Summary: Python library for Apple's PKL.
 Author-email: Jungwoo Yang <jwyang0213@gmail.com>
 License: MIT License
@@ -25,9 +25,9 @@ License: MIT License
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
         
-Project-URL: Homepage, https://github.com/jw-y/pkl
-Project-URL: Bug Reports, https://github.com/jw-y/pkl/issues
-Project-URL: Source, https://github.com/jw-y/pkl
+Project-URL: Homepage, https://github.com/jw-y/pkl-python
+Project-URL: Bug Reports, https://github.com/jw-y/pkl-python/issues
+Project-URL: Source, https://github.com/jw-y/pkl-python
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -68,21 +68,26 @@ Here's how you can start using `pkl-python` to load a PKL module:
 import pkl
 
 config = pkl.load("path/to/pkl/example_module.pkl")
-print(config)
+```
+
+### Code Generation
+As Python is a dynamic language, codegen is not strictly necessary.
+However, codegen lets you expect contents of pkl files within Python modules.
+
+```
+pkl-gen-python path/to/pkl/example_module.pkl
 ```
 
 ### Status
-* Evaluator API: fully functional
-* Code Generation: in development
+* Evaluator API: functional
+* Code Generation: functional, but needs refining
 
 ### TODO
-* [ ] (codgen) pip binary installation
-* [ ] (codgen) fix class order
+* [x] (codgen) pip binary installation
+* [ ] (codgen) gatherer depth-first ordering
 * [ ] (codgen) clean up code
 
 
-## Usage
-
 ## Advanced Features
 For details on the parameters, refer [Message Passing API](https://pkl-lang.org/main/current/bindings-specification/message-passing-api.html).
 

pkl-python-0.1.13/src/pkl_python.egg-info/SOURCES.txt

@@ -0,0 +1,26 @@
+LICENSE
+README.md
+pyproject.toml
+setup.py
+src/pkl/VERSION
+src/pkl/__init__.py
+src/pkl/evaluator_manager.py
+src/pkl/evaluator_options.py
+src/pkl/msgapi.py
+src/pkl/parser.py
+src/pkl/reader.py
+src/pkl/server.py
+src/pkl/utils.py
+src/pkl_python.egg-info/PKG-INFO
+src/pkl_python.egg-info/SOURCES.txt
+src/pkl_python.egg-info/dependency_links.txt
+src/pkl_python.egg-info/entry_points.txt
+src/pkl_python.egg-info/requires.txt
+src/pkl_python.egg-info/top_level.txt
+tests/test_evaluator_manager.py
+tests/test_fixtures.py
+tests/test_load.py
+tests/test_parser.py
+tests/test_readers.py
+tests/test_server.py
+tests/test_trace.py

pkl-python-0.1.13/src/pkl_python.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+pkl-gen-python = pkl_gen_python:main

{pkl-python-0.1.12 → pkl-python-0.1.13}/tests/test_evaluator_manager.py

@@ -10,5 +10,5 @@ def test_multiple():
     with EvaluatorManager(debug=True) as manager:
         opts = PreconfiguredOptions()
         evaluator = manager.new_evaluator(opts)
-        source = ModuleSource.from_path("./tests/with_log.pkl")
+        source = ModuleSource.from_path("./tests/pkls/with_log.pkl")
         evaluator.evaluate_module(source)

pkl-python-0.1.13/tests/test_fixtures.py

@@ -0,0 +1,128 @@
+from pathlib import Path
+
+import pkl
+from tests.Fixtures.Generated.AnyType_pkl import AnyType, Bird
+from tests.Fixtures.Generated.ApiTypes_pkl import ApiTypes
+from tests.Fixtures.Generated.Classes_pkl import Animal, Classes
+from tests.Fixtures.Generated.Collections_pkl import Collections
+from tests.Fixtures.Generated.ExtendedModule_pkl import ExtendedModule
+
+base_path = Path("./tests/Fixtures")
+
+
+def test_evaluate_classes():
+    result = Classes.load_pkl(base_path / "Classes.pkl")
+    expected = Classes(
+        animals=[
+            Animal(name="Uni"),
+            Animal(name="Wally"),
+            Animal(name="Mouse"),
+        ]
+    )
+    assert result == expected
+
+
+def test_evaluate_collections():
+    result = Collections.load_pkl(base_path / "Collections.pkl")
+    expected = Collections(
+        res1=[1, 2, 3],
+        res2=[2, 3, 4],
+        res3=[[1], [2], [3]],
+        res4=[[1], [2], [3]],
+        res5={1: True, 2: False},
+        res6={1: {1: True}, 2: {2: True}, 3: {3: True}},
+        res7={1: True, 2: False},
+        res8={1: {1: True}, 2: {2: False}},
+        res9={"one", "two", "three"},
+        res10={1, 2, 3},
+    )
+    assert result == expected
+
+
+def test_evaluate_api_types():
+    result = ApiTypes.load_pkl(base_path / "ApiTypes.pkl")
+    # Define expected result based on your ApiTypes.Module structure
+    expected = ApiTypes(
+        res1=pkl.Pair(42, "Hello"),
+        res2=pkl.Duration(10, "h"),
+        res3=pkl.DataSize(1.2345, "gib"),
+    )
+    assert result == expected
+
+
+def test_polymorphic_types():
+    from tests.Fixtures.Generated.pkl_python_example_Poly_pkl import (
+        Animal,
+        Bird,
+        Dog,
+        Poly,
+    )
+
+    result = Poly.load_pkl(base_path / "Poly.pkl")
+    expected = Poly(
+        beings=[
+            Animal(name="Lion", exists=True),
+            Dog(barks=True, hates=None, name="Ruuf", exists=True),
+            Bird(name="Duck", flies=False, exists=False),
+        ],
+        rex=Dog(barks=False, hates=None, name="Rex", exists=True),
+        moreBeings={
+            "duck": Bird(name="Ducky", flies=True, exists=True),
+            "dog": Dog(
+                barks=False,
+                hates=Dog(barks=False, hates=None, name="Rex", exists=True),
+                name="TRex",
+                exists=True,
+            ),
+        },
+    )
+    assert result == expected
+
+
+def test_polymorphic_modules():
+    result = ExtendedModule.load_pkl(base_path / "ExtendedModule.pkl")
+    expected = ExtendedModule(foo="foo", bar=10)
+    assert result == expected
+
+
+def test_any_type():
+    result = AnyType.load_pkl(base_path / "AnyType.pkl")
+    expected = AnyType(
+        bird=Bird(species="Owl"),
+        primitive="foo",
+        primitive2=12,
+        array=[1, 2],
+        set={5, 6},
+        mapping={"1": 12, 12: "1"},
+        nullable=None,
+        duration=pkl.Duration(5.0, unit="min"),
+        dataSize=pkl.DataSize(10.0, unit="mb"),
+    )
+    assert result == expected
+
+
+def test_union_types():
+    from tests.Fixtures.Generated.UnionTypes_pkl import (
+        Apple,
+        Banana,
+        Donkey,
+        Grape,
+        UnionTypes,
+        Zebra,
+    )
+
+    result = UnionTypes.load_pkl(base_path / "UnionTypes.pkl")
+    expected = UnionTypes(
+        fruit1=Banana(isRipe=True),
+        fruit2=Grape(isUsedForWine=True),
+        fruit3=Apple(isRed=False),
+        city1="San Francisco",
+        city2="Tokyo",
+        city3="Zurich",
+        city4="London",
+        animal1=Zebra(name="Zebra"),
+        animal2=Donkey(name="Donkey"),
+        animalOrString1=Zebra(name="Zebra"),
+        animalOrString2="Zebra",
+    )
+    assert result == expected

{pkl-python-0.1.12 → pkl-python-0.1.13}/tests/test_load.py

@@ -2,11 +2,11 @@ import pkl
 
 
 def test_load():
-    _ = pkl.load("./tests/types.pkl")
+    _ = pkl.load("./tests/pkls/types.pkl")
 
 
 def test_load_expr():
-    config = pkl.load("./tests/types.pkl", expr="datasize")
+    config = pkl.load("./tests/pkls/types.pkl", expr="datasize")
     assert config.__class__.__name__ == "DataSize"
 
 
@@ -16,4 +16,4 @@ def test_load_text():
 
 
 def test_load_debug():
-    _ = pkl.load("./tests/types.pkl", debug=True)
+    _ = pkl.load("./tests/pkls/types.pkl", debug=True)

{pkl-python-0.1.12 → pkl-python-0.1.13}/tests/test_parser.py

@@ -54,5 +54,5 @@ def test_lib1():
 
 
 def test_types():
-    file = Path("./tests") / "types.pkl"
+    file = Path("./tests/pkls") / "types.pkl"
     _ = pkl.load(file)

{pkl-python-0.1.12 → pkl-python-0.1.13}/tests/test_readers.py

@@ -24,7 +24,7 @@ def test_read_modules():
         moduleReaders=[TestModuleReader("customfs", True, True, True)]
     )
     opts.allowedModules.append("customfs:")
-    _ = pkl.load("./tests/myModule.pkl", evaluator_options=opts)
+    _ = pkl.load("./tests/pkls/myModule.pkl", evaluator_options=opts)
 
 
 def test_read_modules_error():
@@ -40,7 +40,7 @@ def test_read_modules_error():
     )
     opts.allowedModules.append("customfs:")
     with pytest.raises(PklError):
-        _ = pkl.load("./tests/myModule.pkl", evaluator_options=opts)
+        _ = pkl.load("./tests/pkls/myModule.pkl", evaluator_options=opts)
 
 
 def test_read_resources():
@@ -60,4 +60,4 @@ def test_read_resources():
     )
     opts.allowedResources.append("customfs:")
 
-    _ = pkl.load("./tests/with_read.pkl", evaluator_options=opts)
+    _ = pkl.load("./tests/pkls/with_read.pkl", evaluator_options=opts)

pkl-python-0.1.13/tests/test_trace.py

@@ -0,0 +1,9 @@
+import pkl
+
+
+def test_trace():
+    _ = pkl.load("tests/trace.pkl")
+
+
+if __name__ == "__main__":
+    test_trace()

pkl-python-0.1.12/pkl/VERSION

@@ -1 +0,0 @@
-0.1.12

pkl-python-0.1.12/pkl_python.egg-info/SOURCES.txt

@@ -1,25 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-setup.py
-pkl/VERSION
-pkl/__init__.py
-pkl/evaluator_manager.py
-pkl/evaluator_options.py
-pkl/msgapi.py
-pkl/parser.py
-pkl/reader.py
-pkl/server.py
-pkl/utils.py
-pkl_python.egg-info/PKG-INFO
-pkl_python.egg-info/SOURCES.txt
-pkl_python.egg-info/dependency_links.txt
-pkl_python.egg-info/requires.txt
-pkl_python.egg-info/top_level.txt
-scripts/download_binary.py
-scripts/eval.py
-tests/test_evaluator_manager.py
-tests/test_load.py
-tests/test_parser.py
-tests/test_readers.py
-tests/test_server.py

pkl-python-0.1.12/scripts/download_binary.py

@@ -1,42 +0,0 @@
-import argparse
-from pathlib import Path
-
-import requests
-
-VERSION = "0.25.2"
-
-BASE_PATH = "https://github.com/apple/pkl/releases/download/"
-filenames = [
-    "pkl-macos-aarch64",
-    "pkl-macos-amd64",
-    "pkl-linux-aarch64",
-    "pkl-linux-amd64",
-    "pkl-alpine-linux-amd64",
-]
-JAVA_FILE = f"https://repo1.maven.org/maven2/org/pkl-lang/pkl-cli-java/{VERSION}/pkl-cli-java-{VERSION}.jar"
-
-
-def main(save_path):
-    urls = [BASE_PATH + VERSION + "/" + file for file in filenames]
-    urls.append(JAVA_FILE)
-
-    for url in urls:
-        file = url.split("/")[-1]
-        fp = save_path / file
-
-        response = requests.get(url)
-        with open(fp, "wb") as f:
-            f.write(response.content)
-
-        print("written to", fp)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "output_path", help="Directory where binaries will be downloaded"
-    )
-
-    args = parser.parse_args()
-
-    main(Path(args.output_path))

pkl-python-0.1.12/scripts/eval.py

@@ -1,32 +0,0 @@
-import argparse
-from pathlib import Path
-from pprint import pprint
-
-import pkll
-
-
-def main(target, force=False, debug=False, is_print=False):
-    target = Path(target)
-
-    if target.is_file():
-        files = [target]
-    elif target.is_dir():
-        files = list(target.glob("*.pkl"))
-    else:
-        raise ValueError(target)
-
-    for f in files:
-        if f.is_file():
-            config = pkll.load(f.absolute().as_uri(), force_render=force, debug=debug)
-            if is_print:
-                pprint(config)
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument("target")
-    parser.add_argument("--force", "-f", action="store_true")
-    parser.add_argument("--debug", "-d", action="store_true")
-    parser.add_argument("--print", "-p", action="store_true")
-    args = parser.parse_args()
-    main(args.target, force=args.force, debug=args.debug, is_print=args.print)