pam-python 0.2.6__tar.gz → 0.2.7__tar.gz

{pam_python-0.2.6 → pam_python-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.2.6
+Version: 0.2.7
 Summary: Pam Python Library
 Author-email: Narongrit Kanhanoi <narongrit@pams.ai>
 Project-URL: Homepage, https://github.com/heart/pam-python

{pam_python-0.2.6 → pam_python-0.2.7}/pam/__init__.py

@@ -1,3 +1,3 @@
 """PAM Data Plugin framework."""
 
-__version__ = "0.2.6"
+__version__ = "0.2.7"

{pam_python-0.2.6 → pam_python-0.2.7}/pam/cli.py

@@ -145,19 +145,10 @@ def _project_name(directory: Path) -> str:
 
 
 def _assert_new_project(directory: Path):
-    known_project_files = set(COMMON_PROJECT_TEMPLATES.values())
-    for templates in PACKAGE_MANAGER_TEMPLATES.values():
-        known_project_files.update(templates.values())
-    known_project_files.update({PROJECT_MARKER, "__init__.py", "uv.lock"})
-    conflicts = [
-        name for name in sorted(known_project_files)
-        if (directory / name).exists()
-    ]
-    if conflicts:
-        raise FileExistsError(
-            "pam init only supports a new project directory; existing files: "
-            + ", ".join(conflicts)
-        )
+    # Kept for backward compatibility; collision handling is now in init_project
+    # via _prompt_overwrite_if_needed. Do not enforce allow-list here so
+    # unrelated files like .DS_Store are ignored.
+    return
 
 
 def _requirement_name(requirement: str) -> str:
@@ -180,45 +171,26 @@ def _assert_fresh_uv_project(directory: Path):
             "Run `uv add pam-python` before `uv run pam init`"
         )
 
-    python_version = directory / ".python-version"
-    if not python_version.is_file() or not python_version.read_text().strip().startswith("3.12"):
-        raise FileExistsError(
-            "A fresh uv project must pin Python 3.12; run `uv init --python 3.12`"
-        )
 
-    allowed = {
-        ".git",
-        ".gitignore",
-        ".python-version",
-        ".venv",
-        "README.md",
-        "main.py",
-        "pyproject.toml",
-        "uv.lock",
-    }
-    unexpected = sorted(path.name for path in directory.iterdir() if path.name not in allowed)
-    if unexpected:
+def _prompt_overwrite_if_needed(directory: Path, templates: dict[str, str]) -> bool:
+    dest_names = set(templates.values()) | {PROJECT_MARKER, "__init__.py"}
+    conflicts = sorted(name for name in dest_names if (directory / name).exists())
+    if not conflicts:
+        return True
+    print("The following files will be overwritten:")
+    for name in conflicts:
+        print(f"  - {name}")
+    # Single confirmation round as requested: list collisions once, ask once.
+    if not sys.stdin.isatty():
         raise FileExistsError(
-            "pam init only accepts a fresh uv project; existing files: "
-            + ", ".join(unexpected)
-        )
-
-    readme = directory / "README.md"
-    if readme.is_file() and readme.read_text(encoding="utf-8").strip():
-        raise FileExistsError("pam init will not overwrite a non-empty README.md")
-
-    main_file = directory / "main.py"
-    if main_file.is_file():
-        source = main_file.read_text(encoding="utf-8")
-        uv_placeholder = re.fullmatch(
-            r'def main\(\):\n'
-            r'    print\("Hello from [a-z0-9-]+!"\)\n\n\n'
-            r'if __name__ == "__main__":\n'
-            r'    main\(\)\n?',
-            source,
+            "pam init will overwrite existing files: " + ", ".join(conflicts) + ". "
+            "Run in an interactive terminal and confirm to overwrite."
         )
-        if uv_placeholder is None:
-            raise FileExistsError("pam init will not overwrite an edited main.py")
+    response = input("มีไฟล์ที่จะถูกเขียนทับตามรายการข้างบน ดำเนินการต่อหรือไม่? (y/N): ").strip().lower()
+    if response != "y":
+        print("Cancelled.")
+        return False
+    return True
 
 
 def _run_uv(args: list[str], cwd: Path):
@@ -263,6 +235,9 @@ def init_project(package_manager: str | None = None):
             if dest not in preserved_uv_files
         }
 
+    if not _prompt_overwrite_if_needed(destination, templates):
+        return
+
     with tempfile.TemporaryDirectory(prefix=".pam-init-", dir=destination) as temp_dir:
         staging = Path(temp_dir)
         for src, dest in templates.items():

{pam_python-0.2.6 → pam_python-0.2.7}/pam_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.2.6
+Version: 0.2.7
 Summary: Pam Python Library
 Author-email: Narongrit Kanhanoi <narongrit@pams.ai>
 Project-URL: Homepage, https://github.com/heart/pam-python

{pam_python-0.2.6 → pam_python-0.2.7}/tests/test_cli_templates.py

@@ -186,6 +186,8 @@ if __name__ == "__main__":
 
             with mock.patch.object(cli.shutil, "which", return_value="/usr/bin/uv"), mock.patch.object(
                 cli, "_run_uv", side_effect=lambda args, cwd: calls.append(list(args))
+            ), mock.patch.object(cli.sys.stdin, "isatty", return_value=True), mock.patch(
+                "builtins.input", return_value="y"
             ):
                 cli.init_project()
 
@@ -217,7 +219,9 @@ if __name__ == "__main__":
             (root / "README.md").touch()
             (root / "main.py").write_text(uv_main)
 
-            with mock.patch.object(cli.shutil, "which", return_value="/usr/bin/uv"):
+            with mock.patch.object(cli.shutil, "which", return_value="/usr/bin/uv"), mock.patch.object(
+                cli.sys.stdin, "isatty", return_value=True
+            ), mock.patch("builtins.input", return_value="y"):
                 cli.init_project()
 
             gitignore = (root / ".gitignore").read_text()
@@ -242,15 +246,17 @@ if __name__ == "__main__":
             (root / ".python-version").write_text("3.12\n")
             (root / "main.py").write_text("print('real code')\n")
 
-            with self.assertRaisesRegex(FileExistsError, "edited main.py"):
-                cli.init_project()
+            with mock.patch.object(cli.sys.stdin, "isatty", return_value=False):
+                with self.assertRaisesRegex(FileExistsError, "will overwrite existing files: main.py"):
+                    cli.init_project()
 
     def test_init_rejects_an_existing_project_without_overwriting(self):
         with tempfile.TemporaryDirectory() as temp_dir, WorkingDirectory(temp_dir):
             original = Path("main.py")
             original.write_text("keep me\n")
-            with self.assertRaises(FileExistsError):
-                cli.init_project("pip")
+            with mock.patch.object(cli.sys.stdin, "isatty", return_value=False):
+                with self.assertRaises(FileExistsError):
+                    cli.init_project("pip")
             self.assertEqual("keep me\n", original.read_text())
 
     def test_service_name_validation_rejects_paths_and_hyphens(self):