pkl-python 0.1.14__tar.gz → 0.1.15__tar.gz

{pkl-python-0.1.14 → pkl_python-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pkl-python
-Version: 0.1.14
+Version: 0.1.15
 Summary: Python library for Apple's PKL.
 Author-email: Jungwoo Yang <jwyang0213@gmail.com>
 License: MIT License
@@ -31,7 +31,7 @@ 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
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: msgpack>=1.0.8

{pkl-python-0.1.14 → pkl_python-0.1.15}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel"]
+requires = ["setuptools>=42", "wheel", "msgpack", "requests"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -11,7 +11,7 @@ authors = [
 ]
 license = { file = "LICENSE" }
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -64,3 +64,14 @@ exclude = ["codegen/snippet-tests/output/*"]
 
 [tool.pytest.ini_options]
 addopts = "-ra -q"
+
+
+[tool.cibuildwheel]
+build = [
+    "*-macosx_x86_64",
+    "*-macosx_arm64",
+    "*-manylinux_aarch64",
+    "*-manylinux_x86_64",
+    #"*-musllinux_x86_64",
+    "*-win_amd64",
+]

pkl_python-0.1.15/src/pkl/VERSION

@@ -0,0 +1 @@
+0.1.15

pkl_python-0.1.15/src/pkl/binary_manager.py

@@ -0,0 +1,185 @@
+import argparse
+import os
+import platform
+import stat
+import subprocess
+from functools import cache
+from pathlib import Path
+
+import requests
+
+ARM_BINARIES = {
+    "darwin": "pkl-macos-aarch64",
+    "linux": "pkl-linux-aarch64",
+}
+AMD64_BINARIES = {
+    "darwin": "pkl-macos-amd64",
+    "linux": "pkl-linux-amd64",
+    "alpine-linux": "pkl-alpine-linux-amd64",
+    "windows": "pkl-windows-amd64.exe",
+}
+# PKL_VERSION = "0.26.3"
+# BASE_PATH = "https://github.com/apple/pkl/releases/download/"
+
+
+class BinaryManager:
+    def __init__(self, download_binary=True):
+        binary_fp = self.is_command_available() or self._downloaded_binary_path()
+        need_to_download = binary_fp is None
+        if download_binary and need_to_download:
+            binary_dir = self._default_bin_dir()
+            binary_url: str = self._determine_binary_url()
+            binary_fp = self.download_binary(binary_dir, binary_url)
+
+        self.binary_path = binary_fp
+
+        # self.binary_dir: Path = binary_dir or self._default_bin_dir()
+        # self.binary_name: str = binary_name or self._determine_binary_name()
+        # self.binary_path: Path = self.binary_dir / self.binary_name
+        # self.binary_base_url = BASE_PATH + PKL_VERSION + "/"
+        # self.binary_url = self.binary_base_url + self.binary_path.name
+
+    def _downloaded_binary_path(self):
+        binary_dir: Path = self._default_bin_dir()
+        if not binary_dir.exists():
+            return None
+        ls = list(binary_dir.iterdir())
+
+        if len(ls) == 0:
+            return None
+        elif len(ls) == 1:
+            return Path(ls[0])
+        else:
+            raise Exception("Something went wrong")
+
+    @cache
+    def get_latest_pkl_release_urls(self):
+        url = "https://api.github.com/repos/apple/pkl/releases/latest"
+        response = requests.get(url)
+        release = response.json()
+        assets = release["assets"]
+        urls = {a["name"]: a["browser_download_url"] for a in assets}
+        return urls
+
+    def is_command_available(self):
+        """
+        Check if a command is available in the system's PATH.
+        """
+        try:
+            if platform.system() == "Windows":
+                result = subprocess.run(
+                    ["where", "pkl"],
+                    check=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                )
+            else:
+                result = subprocess.run(
+                    ["which", "pkl"],
+                    check=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                )
+            return result.stdout.decode().splitlines()[0].strip()
+        except subprocess.CalledProcessError:
+            return None
+
+    def download_binary(self, binary_dir: Path, binary_url: str):
+        binary_dir.mkdir(exist_ok=True, parents=True)
+        return self._download_and_save_binary(binary_url, binary_dir)
+
+    def get_binary_filepath(self):
+        return str(self.binary_path)
+
+    def detect_system(self):
+        def is_alpine_linux():
+            return os.path.isfile("/etc/alpine-release")
+
+        def detect_processor_architecture():
+            architecture = platform.machine().lower()
+            if "arm" in architecture or "aarch64" in architecture:
+                return "ARM"
+            elif "x86_64" in architecture or "amd64" in architecture:
+                return "AMD64"
+            else:
+                return None
+
+        os_name = platform.system().lower()
+        if os_name == "linux" and is_alpine_linux():
+            os_name = "alpine-linux"
+        arch = detect_processor_architecture()
+        return os_name, arch
+
+    def _determine_binary_url(self) -> str:
+        os_name, arch = self.detect_system()
+        if arch == "ARM":
+            bin_name = ARM_BINARIES.get(os_name)
+        else:
+            bin_name = AMD64_BINARIES.get(os_name)
+
+        if bin_name is None:
+            raise OSError(
+                f"No compatible binary found for your system: {os_name}, {arch}"
+            )
+        name_to_url_map = self.get_latest_pkl_release_urls()
+        url = name_to_url_map[bin_name]
+        return url
+
+    @classmethod
+    def _default_bin_dir(cls) -> Path:
+        bin_dir = Path(__file__).parent / "bin"
+        return bin_dir
+
+    """
+    def download_all_binary(self):
+        download_dir = self._default_bin_dir()
+        download_dir.mkdir(exist_ok=True)
+        for filename in BINARIES.values():
+            url = self.binary_base_url + filename
+            self._download_and_save_binary(url, download_dir)
+    """
+
+    @classmethod
+    def _fetch_binary(cls, url):
+        response = requests.get(url)
+        response.raise_for_status()
+        return response.content
+
+    @classmethod
+    def _download_and_save_binary(
+        cls, url, target_dir: Path, filename=None, skip_exists=True
+    ) -> Path:
+        assert target_dir.is_dir()
+        content = cls._fetch_binary(url)
+
+        default_filename = Path(url).name
+        binary_fp = target_dir / (filename or default_filename)
+
+        if skip_exists and binary_fp.exists():
+            return binary_fp
+
+        with open(binary_fp, "wb") as f:
+            f.write(content)
+        print(f"Successfully installed {binary_fp}")
+        os.chmod(binary_fp, os.stat(binary_fp).st_mode | stat.S_IXUSR)
+        return binary_fp
+
+    def check(self):
+        cmd = [self.binary_path, "-v"]
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        stdout = result.stdout
+        return stdout
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--binary_dir")
+    args = parser.parse_args()
+
+    binary_dir = Path(args.binary_dir)
+    manager = BinaryManager(binary_dir=binary_dir)
+    manager.download_all_binary()
+
+
+if __name__ == "__main__":
+    main()

{pkl-python-0.1.14 → pkl_python-0.1.15}/src/pkl/server.py

@@ -1,23 +1,9 @@
 import atexit
 import os
-import platform
 import signal
-import stat
 import subprocess
-from pathlib import Path
 
 import msgpack
-import requests
-
-BINARIES = {
-    ("darwin", "64bit"): "pkl-macos-amd64",
-    ("darwin", "aarch64"): "pkl-macos-aarch64",
-    ("linux", "64bit"): "pkl-linux-amd64",
-    ("linux", "aarch64"): "pkl-linux-aarch64",
-    ("linux", "64bit", "alpine"): "pkl-alpine-linux-amd64",
-}
-PKL_VERSION = "0.25.3"
-BASE_PATH = "https://github.com/apple/pkl/releases/download/"
 
 
 def preexec_function():
@@ -25,53 +11,6 @@ def preexec_function():
     signal.signal(signal.SIGHUP, signal.SIG_IGN)
 
 
-def detect_system():
-    os_name = platform.system().lower()
-    arch, _ = platform.architecture()
-    return os_name, arch
-
-
-def is_alpine_linux():
-    return os.path.isfile("/etc/alpine-release")
-
-
-def execute_binary(binary_path):
-    subprocess.run([binary_path, "server"], check=True)
-
-
-def download_binary(file, target_fp):
-    url = BASE_PATH + PKL_VERSION + "/" + file
-    response = requests.get(url)
-    with open(target_fp, "wb") as f:
-        f.write(response.content)
-
-
-def get_binary_path():
-    os_name, arch = detect_system()
-    if os_name == "linux" and is_alpine_linux():
-        os_name = "alpine"
-    binary_key = (os_name, arch)
-    if binary_key == ("linux", "64bit") and is_alpine_linux():
-        binary_key += ("alpine",)
-    bin_file = BINARIES.get(binary_key)
-
-    if bin_file is None:
-        raise OSError("No compatible binary found for your system.")
-
-    bin_parent_path = (Path("~/.pkl/bin/") / PKL_VERSION).expanduser()
-    binary_path = bin_parent_path / bin_file
-
-    if not binary_path.exists():
-        binary_path.parent.mkdir(exist_ok=True, parents=True)
-        download_binary(bin_file, binary_path)
-
-    current_permissions = os.stat(binary_path).st_mode
-    new_permissions = current_permissions | stat.S_IXUSR
-    os.chmod(binary_path, new_permissions)
-
-    return binary_path
-
-
 _PROCESSES = []
 
 
@@ -86,7 +25,12 @@ atexit.register(terminate_processes)
 
 class PKLServer:
     def __init__(self, cmd=None, debug=False):
-        self.cmd = cmd or [get_binary_path(), "server"]
+        from pkl.binary_manager import BinaryManager
+
+        manager = BinaryManager()
+        binary_path = manager.get_binary_filepath()
+
+        self.cmd = cmd or [binary_path, "server"]
         self.next_request_id = 1
         self.unpacker = msgpack.Unpacker()
 

{pkl-python-0.1.14 → pkl_python-0.1.15}/src/pkl_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pkl-python
-Version: 0.1.14
+Version: 0.1.15
 Summary: Python library for Apple's PKL.
 Author-email: Jungwoo Yang <jwyang0213@gmail.com>
 License: MIT License
@@ -31,7 +31,7 @@ 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
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: msgpack>=1.0.8

{pkl-python-0.1.14 → pkl_python-0.1.15}/src/pkl_python.egg-info/SOURCES.txt

@@ -1,10 +1,10 @@
 LICENSE
 README.md
 pyproject.toml
-setup.py
 src/pkl_gen_python.py
 src/pkl/VERSION
 src/pkl/__init__.py
+src/pkl/binary_manager.py
 src/pkl/evaluator_manager.py
 src/pkl/evaluator_options.py
 src/pkl/msgapi.py
@@ -18,6 +18,7 @@ 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_binary.py
 tests/test_evaluator_manager.py
 tests/test_fixtures.py
 tests/test_load.py

pkl_python-0.1.15/tests/test_binary.py

@@ -0,0 +1,61 @@
+import os
+from pathlib import Path
+
+import pytest
+
+import pkl
+from pkl.binary_manager import BinaryManager
+
+
+def remove_pkl_from_path(monkeypatch):
+    manager = BinaryManager()
+    path = manager.is_command_available()
+    if path is None:
+        return
+    path = path.rsplit("/", 1)[0]
+    original_path = os.environ.get("PATH", "")
+    paths = original_path.split(os.pathsep)
+    paths = [p for p in paths if path not in p]
+    monkeypatch.setenv("PATH", os.pathsep.join(paths))
+
+
+def remove_pkl_binary():
+    path = Path(pkl.__file__)
+    ls = list((path.parent / "bin").iterdir())
+    if len(ls) == 0:
+        return
+    assert len(ls) == 1
+    binary_path = ls[0]
+    os.remove(binary_path)
+    return binary_path
+
+
+def test_latest_release():
+    manager = BinaryManager()
+    urls = manager.get_latest_pkl_release_urls()
+    assert len(urls) == 7
+
+
+def test_without_download_binary():
+    manager = BinaryManager()
+    output = manager.check()
+    assert output.lower().startswith("pkl")
+
+
+def test_download_binary(monkeypatch: pytest.MonkeyPatch):
+    remove_pkl_binary()
+    remove_pkl_from_path(monkeypatch)
+    manager = BinaryManager()
+    output = manager.check()
+    assert output.lower().startswith("pkl")
+
+    removed = remove_pkl_binary()
+    assert manager.binary_path == removed
+
+
+def test_binary_file_exists():
+    manager = BinaryManager()
+    manager.is_command_available()
+
+    fp = manager.get_binary_filepath()
+    assert os.path.exists(fp), f"Binary file not found at {fp}"

pkl-python-0.1.14/setup.py

@@ -1,74 +0,0 @@
-import os
-import platform
-import stat
-from pathlib import Path
-
-import setuptools
-from setuptools.command.install import install
-
-BINARIES = {
-    ("darwin", "64bit"): "pkl-macos-amd64",
-    ("darwin", "aarch64"): "pkl-macos-aarch64",
-    ("linux", "64bit"): "pkl-linux-amd64",
-    ("linux", "aarch64"): "pkl-linux-aarch64",
-    ("linux", "64bit", "alpine"): "pkl-alpine-linux-amd64",
-}
-PKL_VERSION = "0.25.3"
-BASE_PATH = "https://github.com/apple/pkl/releases/download/"
-
-
-def detect_system():
-    os_name = platform.system().lower()
-    arch, _ = platform.architecture()
-    return os_name, arch
-
-
-def is_alpine_linux():
-    return os.path.isfile("/etc/alpine-release")
-
-
-def download_binary(file, target_fp):
-    import requests
-
-    url = BASE_PATH + PKL_VERSION + "/" + file
-    response = requests.get(url)
-    with open(target_fp, "wb") as f:
-        f.write(response.content)
-
-
-def get_binary_path():
-    os_name, arch = detect_system()
-    if os_name == "linux" and is_alpine_linux():
-        os_name = "alpine"
-    binary_key = (os_name, arch)
-    if binary_key == ("linux", "64bit") and is_alpine_linux():
-        binary_key += ("alpine",)
-    bin_file = BINARIES.get(binary_key)
-
-    if bin_file is None:
-        raise OSError("No compatible binary found for your system.")
-
-    bin_parent_path = (Path("~/.pkl/bin/") / PKL_VERSION).expanduser()
-    binary_path = bin_parent_path / bin_file
-
-    if not binary_path.exists():
-        binary_path.parent.mkdir(exist_ok=True, parents=True)
-        download_binary(bin_file, binary_path)
-
-    current_permissions = os.stat(binary_path).st_mode
-    new_permissions = current_permissions | stat.S_IXUSR
-    os.chmod(binary_path, new_permissions)
-
-    return binary_path
-
-
-class CustomInstallCommand(install):
-    def run(self):
-        get_binary_path()
-        install.run(self)
-
-
-setuptools.setup(
-    cmdclass={"install": CustomInstallCommand},
-    setup_requires=["requests"],
-)

pkl-python-0.1.14/src/pkl/VERSION

@@ -1 +0,0 @@
-0.1.14