viperx 0.9.40__py3-none-any.whl → 0.9.50__py3-none-any.whl

viperx/config_engine.py

@@ -47,15 +47,22 @@ class ConfigEngine:
         workspace_conf = self.config.get("workspace", {})
         
         project_name = project_conf.get("name")
-        target_dir = self.root_path / project_name
         
-        # 1. Root Project Handling
-        # If we are NOT already in the project dir (checking name), we might need to create it
-        # Or if we are running in the root of where `viperx init` is called.
+        # STRICT NAMING: Always calculate the expected root path using sanitized name
+        from viperx.utils import sanitize_project_name
+        clean_name = sanitize_project_name(project_name)
         
-        # Heuristic: Are we already in a folder named 'project_name'?
-        if self.root_path.name == project_name:
+        # Default assumption: current_root is the target directory (folder with underscores)
+        current_root = self.root_path / clean_name
+        target_dir = current_root
+
+        # 1. Root Project Handling
+        # Heuristic: Are we already in a folder matching the raw name OR sanitized name?
+        # e.g. inside test_classic/
+        if self.root_path.name == project_name or self.root_path.name == clean_name:
             # We are inside the project folder
+            current_root = self.root_path
+            
             if not (self.root_path / "pyproject.toml").exists():
                  console.print(Panel(f"⚠️  [bold yellow]Current directory matches name but is not initialized. Hydrating:[/bold yellow] {project_name}", border_style="yellow"))
                  gen = ProjectGenerator(
@@ -69,28 +76,27 @@ class ConfigEngine:
                     use_config=settings_conf.get("use_config", True),
                     use_tests=settings_conf.get("use_tests", True),
                     framework=settings_conf.get("framework", FRAMEWORK_PYTORCH),
-                    scripts={project_name: f"{project_name}.main:main"}, # Simple default for hydration 
+                    scripts={project_name: f"{clean_name}.main:main"}, 
                     verbose=self.verbose
                 )
-                 # generate() expects parent dir, and will operate on parent/name (which is self.root_path)
                  gen.generate(self.root_path.parent)
             else:
                 console.print(Panel(f"♻️  [bold blue]Syncing Project:[/bold blue] {project_name}", border_style="blue"))
-            current_root = self.root_path
+                
         else:
-            # We are outside, check if it exists
+            # We are outside
+            # target_dir (clean) is already set as current_root default
+            
             if target_dir.exists() and (target_dir / "pyproject.toml").exists():
-                console.print(Panel(f"♻️  [bold blue]Updating Existing Project:[/bold blue] {project_name}", border_style="blue"))
-                current_root = target_dir
+                console.print(Panel(f"♻️  [bold blue]Updating Existing Project:[/bold blue] {project_name} ({target_dir.name})", border_style="blue"))
             else:
                 if target_dir.exists():
                      console.print(Panel(f"⚠️  [bold yellow]Directory exists but not initialized. Hydrating:[/bold yellow] {project_name}", border_style="yellow"))
+                
                 # Prepare Scripts & Dependency Context
                 packages = workspace_conf.get("packages", [])
                 
                 # --- Aggregate Global Dependencies ---
-                # Start with Root Settings
-                # Root is always present (ProjectGenerator uses these)
                 root_use_config = settings_conf.get("use_config", True)
                 root_use_env = settings_conf.get("use_env", False)
                 root_type = settings_conf.get("type", TYPE_CLASSIC)
@@ -102,22 +108,19 @@ class ConfigEngine:
                 glob_is_dl = root_type == TYPE_DL
                 glob_frameworks = {root_framework} if glob_is_dl else set()
 
-                project_scripts = {project_name: f"{project_name}.main:main"}
+                project_scripts = {project_name: f"{clean_name}.main:main"} # Use clean mapping
                 
                 for pkg in packages:
                     # Scripts
                     pkg_name = pkg.get("name")
-                    from viperx.utils import sanitize_project_name
                     pkg_name_clean = sanitize_project_name(pkg_name)
-                    # CLI Command = Raw Name (e.g. test-classic) -> sanitized module path (test_classic.main:main)
                     project_scripts[pkg_name] = f"{pkg_name_clean}.main:main"
                     
                     # Dependency Aggregation
-                    # Inherit defaults if not defined in pkg
                     p_config = pkg.get("use_config", settings_conf.get("use_config", True))
                     p_env = pkg.get("use_env", settings_conf.get("use_env", False))
                     p_type = pkg.get("type", TYPE_CLASSIC)
-                    p_framework = pkg.get("framework", FRAMEWORK_PYTORCH) # Defaults to pytorch if implicit
+                    p_framework = pkg.get("framework", FRAMEWORK_PYTORCH)
 
                     if p_config: glob_has_config = True
                     if p_env: glob_has_env = True
@@ -134,9 +137,8 @@ class ConfigEngine:
                     "frameworks": list(glob_frameworks)
                 }
 
-                # Create Root (or Hydrate)
                 gen = ProjectGenerator(
-                    name=project_name,
+                    name=project_name, # Raw name
                     description=project_conf.get("description", ""),
                     type=settings_conf.get("type", TYPE_CLASSIC),
                     author=project_conf.get("author", None),
@@ -151,7 +153,14 @@ class ConfigEngine:
                     verbose=self.verbose
                 )
                 gen.generate(self.root_path)
-                current_root = target_dir
+                
+                # Verify creation
+                if not current_root.exists():
+                     if (self.root_path / project_name).exists():
+                         current_root = self.root_path / project_name
+                     
+                if self.verbose:
+                     console.print(f"[debug] Project Root resolves to: {current_root}")
         
         # 2. Copy Config to Root (Source of Truth)
         # Only if we aren't reading the one already there
@@ -164,7 +173,7 @@ class ConfigEngine:
         # 3. Handle Workspace Packages
         packages = workspace_conf.get("packages", [])
         if packages:
-            console.print(f"\n📦 [bold]Processing {len(packages)} workspace packages...[/bold]")
+            console.print(f"\\n📦 [bold]Processing {len(packages)} workspace packages...[/bold]")
             
             for pkg in packages:
                 pkg_name = pkg.get("name")
@@ -187,4 +196,4 @@ class ConfigEngine:
                 # Check if package seems to exist (ProjectGenerator handles upgrade logic too)
                 pkg_gen.add_to_workspace(current_root)
 
-        console.print(Panel(f"✨ [bold green]Configuration Applied Successfully![/bold green]\nProject is up to date with {self.config_path.name}", border_style="green"))
+        console.print(Panel(f"✨ [bold green]Configuration Applied Successfully![/bold green]\\nProject is up to date with {self.config_path.name}", border_style="green"))

viperx/core.py

@@ -117,27 +117,10 @@ class ProjectGenerator:
         if self.verbose:
             console.print(f"  [{style}]{message}[/{style}]")
 
-    def generate(self, target_dir: Optional[Path] = None):
-        """Main generation flow using uv init."""
-        if target_dir is None:
-            target_dir = Path.cwd()
-
-        project_dir = target_dir / self.raw_name
-        
-        if project_dir.exists():
-            console.print(f"[bold red]Error:[/bold red] Directory {project_dir} already exists.")
-            return
-
-        console.print(f"[bold green]Creating project {self.raw_name} ({self.type})...[/bold green]")
-        
-        self.log(f"Target directory: {project_dir}")
-        self.log(f"System Python: {self.system_python_version}")
-        self.log(f"Project Python: {self.python_version}")
-
-
     def generate(self, target_dir: Path, is_subpackage: bool = False):
         """Main generation flow using uv init."""
-        project_dir = target_dir / self.raw_name
+        # STRICT DIRECTORY NAMING: Always use sanitized name
+        project_dir = target_dir / self.project_name
         
         # 1. Scaffolding with uv init
         try:
@@ -200,7 +183,7 @@ class ProjectGenerator:
                     (project_dir / f).unlink()
         
         # 5. Git & Final Steps
-        console.print(f"\n[bold green]✓ Project {self.raw_name} created successfully![/bold green]")
+        console.print(f"\n[bold green]✓ Project {self.raw_name} created in {self.project_name}/ successfully![/bold green]")
         if not is_subpackage:
             console.print(f"  [dim]cd {self.project_name} && uv sync[/dim]")
 

viperx/main.py

@@ -152,6 +152,13 @@ def config_main(
 
     console.print(Panel(f"Initializing [bold blue]{name}[/bold blue]", border_style="blue"))
     
+    # Check if target directory (sanitized) exists
+    from viperx.utils import sanitize_project_name
+    name_clean = sanitize_project_name(name)
+    target_dir = Path.cwd() / name_clean
+    if target_dir.exists():
+         console.print(f"[bold yellow]Warning:[/bold yellow] Directory {name_clean} already exists. Updating.")
+    
     generator = ProjectGenerator(
         name=name,
         description=description,

viperx/templates/README.md.j2

@@ -7,7 +7,7 @@
 ## 🧐 Philosophy & Architecture
 
 Values transparency and standard tooling over "black box" magic.
-This project was generated with [ViperX](https://github.com/kpihx/viperx).sh/uv/)**, the extremely fast Python package and project manager written in Rust.
+This project was generated with [ViperX](https://github.com/kpihx/viperx), using **[uv](https://docs.astral.sh/uv/)**, the extremely fast Python package and project manager written in Rust.
 
 ### Why `uv`?
 Unlike traditional workflows (pip, poetry, venv mixing), `uv` manages the **entire lifecycle**:
@@ -18,17 +18,25 @@ Unlike traditional workflows (pip, poetry, venv mixing), `uv` manages the **enti
 {% endif %}
 - **Environment**: Virtual environments are managed internally, you just run `uv run`.
 
+{% if has_config or use_env %}
 ### ⚙️ Configuration
 
-- **Config**: `src/{{ package_name }}/config.yaml` (Loaded automatically)
 {% if has_config %}
+- **Config**: `src/{{ package_name }}/config.yaml` (Loaded automatically)
+{% endif %}
+{% if use_env %}
 - **Environment**: `src/{{ package_name }}/.env` (Isolated variables)
 {% endif %}
 
-Edit `config.yaml` to change parameters. The project uses a **Config-in-Package** architecture:
+The project uses a **Config-in-Package** architecture:
+{% if has_config %}
 1. `config.yaml` is inside the package.
 2. `config.py` loads it safely (even in production wheels).
+{% endif %}
+{% if use_env %}
 3. `.env` is isolated within the package source.
+{% endif %}
+{% endif %}
 
 ---
 
@@ -42,8 +50,7 @@ No need to install Python or create venvs manually.
 ### Installation
 
 ```bash
-# Clone the repo
-git clone https://github.com/{{ author_name | lower | replace(" ", "") }}/{{ project_name }}.git
+# Ensure you are in the project directory
 cd {{ project_name }}
 
 # Sync dependencies (creates .venv and installs python if needed)
@@ -52,15 +59,13 @@ uv sync
 
 ## 🧑‍💻 Usage
 
-The entry point depends on your project type.
-
 ### For Developers (Code)
 
 To run the package entry point or scripts:
 
 ```bash
 # Run the main package
-uv run {{ package_name }}
+uv run {{ project_name }}
 
 # Or run a specific script
 uv run python src/{{ package_name }}/main.py
@@ -77,29 +82,36 @@ uv run jupyter notebook
 
 - Open `notebooks/Base.ipynb`.
 - Note how it imports `config` from the package.
-{% endif %}
 
 ### ☁️ Cloud (Colab / Kaggle)
 
 You can use the code and config from this repository directly in cloud environments without cloning.
 
-**Step 1: Install directly from GitHub**
+**Step 1: Install directly from Git**
 ```python
-!pip install git+https://github.com/{{ author_name | lower | replace(" ", "") }}/{{ project_name }}.git
+!pip install git+https://your-git-provider.com/username/repo.git
 ```
 
 **Step 2: Use the unified config**
 ```python
+{% if project_type == 'classic' %}
+from {{ package_name }} import SETTINGS
+{% else %}
 from {{ package_name }} import get_dataset_path, SETTINGS
 import kagglehub as kh
+{% endif %}
 
 # Transparency: You can inspect what was loaded
-print(f"Loaded config for: {SETTINGS['project_name']}")
+print(f"Loaded config for: {SETTINGS.get('project_name', 'Unknown')}")
 
+{% if project_type != 'classic' %}
 # Download datasets defined in config.yaml
 # The key 'titanic' maps to 'heptapod/titanic' in the yaml
-path = kh.dataset_download(SETTINGS['datasets']['titanic'])
+if 'datasets' in SETTINGS and 'titanic' in SETTINGS['datasets']:
+    path = kh.dataset_download(SETTINGS['datasets']['titanic'])
+{% endif %}
 ```
+{% endif %}
 
 ## 🔧 Internal Structure
 
@@ -109,14 +121,22 @@ path = kh.dataset_download(SETTINGS['datasets']['titanic'])
 ├── uv.lock             # Exact versions lockfile
 ├── .python-version     # Pinned Python version
 ├── src/
-│   └── {{ package_name }}/
+{% for name, entry in scripts.items() %}
+{% set pkg_dir = entry.split('.')[0] %}
+│   └── {{ pkg_dir }}/
 │       ├── __init__.py
+{% if has_config %}
 │       ├── config.yaml # EDIT THIS for project settings
 │       ├── config.py   # Code that loads the yaml above
+{% endif %}
+{% if use_tests %}
 │       └── tests/      # Unit tests
+{% endif %}
+{% endfor %}
 {% if project_type in ['ml', 'dl'] %}
 └── notebooks/          # Experimentation (Jupyter)
 {% endif %}
 ```
 
 
+

viperx/templates/__init__.py.j2

@@ -1,5 +1,8 @@
 {% if has_config %}
-from .config import SETTINGS, get_config, get_dataset_path
+from .config import SETTINGS, get_config
+{% if project_type != 'classic' %}
+from .config import get_dataset_path
+{% endif %}
 {% endif %}
 
 

viperx/templates/main.py.j2

@@ -1,13 +1,13 @@
-{% if has_config %}
+{%- if has_config %}
 from {{ package_name }} import SETTINGS
-{% endif %}
+{%- endif %}
 
 def main():
-    {% if has_config %}
+    {%- if has_config %}
     print(f"Hi from {SETTINGS['project_name']}!")
-    {% else %}
+    {%- else %}
     print("Hi from viperx!")
-    {% endif %}
+    {%- endif %}
 
 if __name__ == "__main__":
     main()

{viperx-0.9.40.dist-info → viperx-0.9.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: viperx
-Version: 0.9.40
+Version: 0.9.50
 Summary: Professional Python Project Initializer with uv, ml/dl support, and embedded config.
 Keywords: python,project-template,uv,data-science,machine-learning
 Author: Ivann KAMDEM

{viperx-0.9.40.dist-info → viperx-0.9.50.dist-info}/RECORD

@@ -1,22 +1,22 @@
 viperx/__init__.py,sha256=mRrD-SK9PtwBhqgLzJrvefdViNsXCyBGknzFNsIou1I,51
-viperx/config_engine.py,sha256=A5u1qUaWlgvXQReRHtF05--spPsd90XgT81zZYR2rBM,9908
+viperx/config_engine.py,sha256=zeCV5toxk4mfafbw61UafBK_WGBNgU1Qf93-dTzwyP8,10034
 viperx/constants.py,sha256=Mv5tFjFxe3tD4VDCEsXiwfiV7biTlzl45ALkHmiK33M,887
-viperx/core.py,sha256=yEACR7U-z5h7_fuCKyy4uljGPMe4S-F1HO5H_XeqHNg,20308
+viperx/core.py,sha256=QDgSsYGzphUmzUa3PV-nY6Dl6unfhzeywIMZsAnDzjM,19722
 viperx/licenses.py,sha256=TPsG1aqNAjtOsvuD6i3SiC5rUK9f3DslPHQkKiV7vxs,12482
-viperx/main.py,sha256=N0pqLnZoWr00XjH1kS5dxbDKEqXvazsVspqLQ_-fF8k,10663
+viperx/main.py,sha256=-k1_vGk-3DCayF1_gGdFthFR_FPWWb2VZz-VBB8y6qc,10996
 viperx/templates/Base.ipynb.j2,sha256=rlGCw7jIds3RiXFrG8D8oAjzXzzj1cayKjBI91k-1kA,3140
 viperx/templates/Base_General.ipynb.j2,sha256=f5ZUu65khtvBeCofs3Lvzccn5Krl0nRGu0dv7SzLvzg,2716
 viperx/templates/Base_Kaggle.ipynb.j2,sha256=gPkmFt4cA5UzhRU_gLZ1UzSjEa7Mgel001Eqiw94-fc,2698
-viperx/templates/README.md.j2,sha256=TJNUwTcKnjALrP0MOSs8UBx8zNhI8erRHrc2-8nuMgQ,3445
-viperx/templates/__init__.py.j2,sha256=j-i1NRnKdvk-EgjijSyx-rfOsxWOVSXCyHY2-JEwMDM,93
+viperx/templates/README.md.j2,sha256=s5HBkx6PEZTv9gsBlmYRJnH4jAuiWJ6qSyaoFVCR_PU,3792
+viperx/templates/__init__.py.j2,sha256=NNzSYZTYzbohNf6zL-u3_WgmiUspuejoS7nLCafB7w8,159
 viperx/templates/config.py.j2,sha256=ExMbopPQPntmkNgbv9uKooGDjv82gh_XhyQmjJ8MiQg,1456
 viperx/templates/config.yaml.j2,sha256=EyeUfIIGvNIyMSHayh4i_0XVxIeu4Wdf2I6uAgfmSf4,552
 viperx/templates/data_loader.py.j2,sha256=hehewwvBAYJM-acKn6_T4cU5EvUPX7wHAurAQ3z3ET4,3696
-viperx/templates/main.py.j2,sha256=cpXjtc9MS6CnGAZ0RK1jaB3xBqh4r5Q4iwscBVB2pcY,258
+viperx/templates/main.py.j2,sha256=v4rukrrLXYgyMt5We02_QU3eNSrKFh-uafVReh-2RKw,263
 viperx/templates/pyproject.toml.j2,sha256=NGrgIJM_pzjbQ3OAgsT_y3mX2n8UzdAg_mo9AERhGmU,1297
 viperx/templates/viperx_config.yaml.j2,sha256=z-teOb1hTYmoVdXBQqgr6kK5fQGkMpI6KsTzbeF0m4Q,1408
 viperx/utils.py,sha256=c9FKL9eRsszNvinQd3zjvA2bRMVhEQI5F26aLN_PPZE,2578
-viperx-0.9.40.dist-info/WHEEL,sha256=RRVLqVugUmFOqBedBFAmA4bsgFcROUBiSUKlERi0Hcg,79
-viperx-0.9.40.dist-info/entry_points.txt,sha256=Is38BrTuf6unQCLgDE990Rjd9HyGldBSw4Uzy_nMePY,44
-viperx-0.9.40.dist-info/METADATA,sha256=h7IGeSpqB1LJ__SFKtWl_PGaJ1tVoZCARLzynArtGEk,6782
-viperx-0.9.40.dist-info/RECORD,,
+viperx-0.9.50.dist-info/WHEEL,sha256=RRVLqVugUmFOqBedBFAmA4bsgFcROUBiSUKlERi0Hcg,79
+viperx-0.9.50.dist-info/entry_points.txt,sha256=Is38BrTuf6unQCLgDE990Rjd9HyGldBSw4Uzy_nMePY,44
+viperx-0.9.50.dist-info/METADATA,sha256=t-3Q_mNDXVdcZCLJVSF3E4JPc5oETU9INZwgTfP6pBc,6782
+viperx-0.9.50.dist-info/RECORD,,