pam-python 0.1.41__tar.gz → 0.1.43__tar.gz

{pam_python-0.1.41/pam_python.egg-info → pam_python-0.1.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.1.41
+Version: 0.1.43
 Summary: Pam Python Library
 Home-page: https://github.com/heart/pam-python
 Author: Narongrit Kanhanoi
@@ -106,6 +106,8 @@ When `requirements.txt` already exists, you will be prompted to choose how to pr
 - keep
 - merge
 
+`pam init` now writes a project baseline `requirements.txt`. It pins `pam-python` to the scaffold version and includes core runtime/test dependencies used by the generated project. It does not copy the current machine's `pip freeze`.
+
 ---
 
 **Create a Service**

{pam_python-0.1.41 → pam_python-0.1.43}/README.md

@@ -67,6 +67,8 @@ When `requirements.txt` already exists, you will be prompted to choose how to pr
 - keep
 - merge
 
+`pam init` now writes a project baseline `requirements.txt`. It pins `pam-python` to the scaffold version and includes core runtime/test dependencies used by the generated project. It does not copy the current machine's `pip freeze`.
+
 ---
 
 **Create a Service**

{pam_python-0.1.41 → pam_python-0.1.43}/pam/cli.py

@@ -2,8 +2,8 @@ import os
 import sys
 import re
 import shutil
-import subprocess
 import importlib.resources as resources
+from importlib import metadata
 
 def main():
     args = sys.argv[1:]
@@ -52,6 +52,13 @@ def cpy(src, dest):
     src_file = os.path.join(template_dir, src)
     shutil.copy(src_file, dest)
 
+
+def read_template_text(src: str) -> str:
+    template_dir = resources.files("pam") / "templates"
+    src_file = os.path.join(template_dir, src)
+    with open(src_file, "r", encoding="utf-8") as file:
+        return file.read()
+
 def replace_template_content(service_name, class_name, file_name):
     file_path = os.path.join(service_name, file_name)
     with open(file_path, 'r+', encoding='utf-8') as file:
@@ -109,6 +116,7 @@ def init_project():
 
     requirements_path = "requirements.txt"
     has_requirements = os.path.exists(requirements_path)
+    template_requirements = _build_project_requirements().splitlines()
 
     mode = "overwrite"
     if has_requirements:
@@ -125,20 +133,13 @@ def init_project():
     if mode == "keep":
         print("Keeping existing requirements.txt")
     else:
-        freeze = subprocess.run(
-            ["pip", "freeze"],
-            check=True,
-            text=True,
-            capture_output=True
-        ).stdout.splitlines()
-
         if mode == "overwrite" or not has_requirements:
             with open(requirements_path, "w", encoding="utf-8") as f:
-                f.write("\n".join(freeze) + ("\n" if freeze else ""))
+                f.write(_build_project_requirements())
         elif mode == "merge":
             with open(requirements_path, "r", encoding="utf-8") as f:
                 existing_lines = f.read().splitlines()
-            merged_lines = _merge_requirements(existing_lines, freeze)
+            merged_lines = _merge_requirements(existing_lines, template_requirements)
             with open(requirements_path, "w", encoding="utf-8") as f:
                 f.write("\n".join(merged_lines) + ("\n" if merged_lines else ""))
 
@@ -155,12 +156,38 @@ def _parse_requirement_name(line: str) -> str:
         return ""
     if line.startswith("-"):
         return line
+    line = line.split(";", 1)[0].strip()
     # Normalize common requirement formats like pkg==1.2, pkg>=1.2, pkg[extra]==1.2
     splitters = ["==", ">=", "<=", "~=", ">", "<"]
     for splitter in splitters:
         if splitter in line:
-            return line.split(splitter, 1)[0].strip()
-    return line
+            line = line.split(splitter, 1)[0].strip()
+            break
+    return line.split("[", 1)[0].strip().lower()
+
+
+def _get_installed_pam_version() -> str:
+    setup_py = os.path.join(os.path.dirname(os.path.dirname(__file__)), "setup.py")
+    if os.path.exists(setup_py):
+        with open(setup_py, "r", encoding="utf-8") as file:
+            content = file.read()
+        match = re.search(r'version="([^"]+)"', content)
+        if match:
+            return match.group(1)
+
+    try:
+        return metadata.version("pam-python")
+    except metadata.PackageNotFoundError:
+        return "0.0.0"
+
+
+def _build_project_requirements() -> str:
+    pam_version = _get_installed_pam_version()
+    template = read_template_text("init/requirements.txt")
+    rendered = template.replace("#PAM_VERSION#", pam_version)
+    if not rendered.endswith("\n"):
+        rendered += "\n"
+    return rendered
 
 
 def _merge_requirements(existing_lines, frozen_lines):

{pam_python-0.1.41 → pam_python-0.1.43}/pam/logger.py

@@ -5,8 +5,7 @@ from threading import Lock
 from typing import Any
 
 from pam.utils import log as stdout_log
-from service import Service
-
+from pam.service import Service
 
 class Logger:
     def __init__(self, service: Service, buffer_size: int = 20, source: str = "worker"):

pam_python-0.1.43/pam/templates/init/requirements.txt

@@ -0,0 +1,6 @@
+pam-python==#PAM_VERSION#
+Flask>=3.0.2
+gunicorn>=23.0.0
+pandas>=2.2.3
+dask>=2024.12.1
+Faker>=33.1.0

{pam_python-0.1.41 → pam_python-0.1.43/pam_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.1.41
+Version: 0.1.43
 Summary: Pam Python Library
 Home-page: https://github.com/heart/pam-python
 Author: Narongrit Kanhanoi
@@ -106,6 +106,8 @@ When `requirements.txt` already exists, you will be prompted to choose how to pr
 - keep
 - merge
 
+`pam init` now writes a project baseline `requirements.txt`. It pins `pam-python` to the scaffold version and includes core runtime/test dependencies used by the generated project. It does not copy the current machine's `pip freeze`.
+
 ---
 
 **Create a Service**

{pam_python-0.1.41 → pam_python-0.1.43}/pam_python.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ pam/templates/init/dockerignore.tmpl
 pam/templates/init/gitignore.tmpl
 pam/templates/init/main.tmpl
 pam/templates/init/pylintrc.tmpl
+pam/templates/init/requirements.txt
 pam/templates/init/run_unit_test.bat
 pam/templates/init/run_unit_test.ps1
 pam/templates/init/run_unit_test.sh

{pam_python-0.1.41 → pam_python-0.1.43}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pam-python",
-    version="0.1.41",
+    version="0.1.43",
     author="Narongrit Kanhanoi",
     author_email="narongrit@pams.ai",
     description="Pam Python Library",