lemonpie-cli 0.1.0__tar.gz → 0.2.0a1__tar.gz

{lemonpie_cli-0.1.0 → lemonpie_cli-0.2.0a1}/.github/workflows/release.yml

@@ -18,6 +18,16 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Verify tag is reachable from main
+        run: |
+          git fetch origin main
+          if git merge-base --is-ancestor "${{ github.sha }}" origin/main; then
+            echo "Tag ${{ github.ref_name }} (commit ${{ github.sha }}) is on main. Proceeding."
+          else
+            echo "::error::Tag ${{ github.ref_name }} (commit ${{ github.sha }}) is not reachable from origin/main. Refusing to publish — merge to main before tagging."
+            exit 1
+          fi
+
       - name: Install uv
         uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
         with:

{lemonpie_cli-0.1.0 → lemonpie_cli-0.2.0a1}/.gitignore

@@ -12,13 +12,10 @@ __pycache__/
 # Packaging output
 dist/
 build/
-lemonpie/_version.py
+src/lemonpie/_version.py
 *.egg-info/
 
-# Runtime artifacts
-config.json
-sessions/*
-!sessions/.gitkeep
+# Runtime logs/temp
 *.log
 *.tmp
 

{lemonpie_cli-0.1.0 → lemonpie_cli-0.2.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lemonpie-cli
-Version: 0.1.0
+Version: 0.2.0a1
 Summary: LemonPie — A lightweight Ollama client for terminal users
 Project-URL: homepage, https://versicode.com/lemonpie
 Project-URL: repository, https://github.com/famousStratum/LemonPie
@@ -8,8 +8,10 @@ Project-URL: issues, https://github.com/famousStratum/LemonPie/issues
 Author-email: famousStratum <info@versicode.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE
-Requires-Python: >=3.8
+Requires-Python: >=3.11
+Requires-Dist: httpx
 Requires-Dist: ollama
+Requires-Dist: platformdirs
 Description-Content-Type: text/markdown
 
 # LemonPie
@@ -25,8 +27,8 @@ LemonPie is a compact CLI for interacting with an Ollama server. It manages chat
 
 ## ✨ Features
 - Start and manage chat sessions with Ollama models
-- Persist session history locally under `sessions/`
-- Configure host, default model, and aliases via `config.json`
+- Persist session history in your OS's standard user data directory
+- Configure host, default model, and aliases via a config file in your OS's standard user config directory
 - Add, remove, and list models with aliases (`lmConfig`)
 - Switch models mid‑session with confirmation
 - Atomic writes for safety (tmp + replace)
@@ -38,25 +40,41 @@ LemonPie is a compact CLI for interacting with an Ollama server. It manages chat
 ## 📂 Project Structure
 
 ```text
-lemonpie/
-├── lemonpie/          # Core package namespace
-│   ├── lm.py          # CLI session manager
-│   ├── lm_config.py   # Config manager
-│   ├── config.py      # Configuration logic & I/O
-│   ├── model_utils.py # Model finding & resolution
-│   ├── cli_utils.py   # Terminal helpers & confirmation
-│   └── ...            # Other shared modules
-├── config.example.json# Configuration template
-├── sessions/          # Session files (created at runtime)
-├── pyproject.toml     # Package & build configuration
-├── README.md          # Project overview
-├── LICENSE            # GPLv3 license
-└── .gitignore         # Ignore venv, sessions, local config
+LemonPie/
+├── src/
+│   └── lemonpie/            # Core package namespace
+│       ├── main.py          # CLI session manager (entrypoints: lm, lemonpie)
+│       ├── config.py        # Configuration logic & I/O
+│       ├── paths.py         # OS-appropriate config/data directory resolution
+│       ├── model_utils.py   # Model finding & resolution
+│       ├── cli_utils.py     # Terminal helpers & confirmation
+│       ├── session_utils.py # Session persistence
+│       ├── spinner.py       # Status spinner
+│       ├── time_utils.py    # Timestamp helpers
+│       └── cli/
+│           └── config_cmd.py # Config manager (entrypoint: lmConfig)
+├── config.example.json      # Configuration template
+├── pyproject.toml           # Package & build configuration
+├── README.md                # Project overview
+├── LICENSE                  # GPLv3 license
+└── .gitignore
 ```
 
 ---
 
-## ⚙️ Configuration (`config.json`)
+## ⚙️ Configuration
+
+LemonPie keeps its config file and session history in your OS's standard user directories (via [`platformdirs`](https://pypi.org/project/platformdirs/)) — not in the project folder:
+
+|            | Linux                          | macOS                                       | Windows                     |
+|------------|---------------------------------|----------------------------------------------|------------------------------|
+| Config     | `~/.config/lemonpie/`           | `~/Library/Application Support/lemonpie/`     | `%LOCALAPPDATA%\lemonpie\`   |
+| Sessions   | `~/.local/share/lemonpie/sessions/` | `~/Library/Application Support/lemonpie/sessions/` | `%LOCALAPPDATA%\lemonpie\sessions\` |
+
+Both are overridable via environment variables — `LEMONPIE_CONFIG_DIR` and `LEMONPIE_SESSIONS_DIR` — useful for testing or running in a container.
+
+`config.example.json` at the repo root is a template. `lmConfig` will create your real config file on first use if one doesn't exist yet.
+
 ### Example structure:
 ```json
 {
@@ -77,7 +95,7 @@ models: list of objects with alias (nullable) and name
 
 ## 🚀 Usage
 
-### lm.py
+### `lm` / `lemonpie`
 - Start a new session \
 `lm -n "Hello"`
 
@@ -96,7 +114,7 @@ models: list of objects with alias (nullable) and name
 - Switch model in current session\
 `lm -m qwen2.5-coder:3b`
 
-### lmConfig.py
+### `lmConfig`
 - Manage models with lmConfig\
 `lmConfig --add-model qwen qwen2.5-coder:3b`\
 `lmConfig --list-models`\
@@ -140,4 +158,3 @@ This project is licensed under the **GNU General Public License v3.0** (**GPLv3*
 
 
 ---
-

{lemonpie_cli-0.1.0 → lemonpie_cli-0.2.0a1}/README.md

@@ -1,129 +1,144 @@
-# LemonPie
-
-**The ultra‑lightweight Ollama session manager for terminal workflows**
-
-![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2FfamousStratum%2FLemonPie%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)
-![GitHub License](https://img.shields.io/github/license/famousstratum/lemonpie)
-
-LemonPie is a compact CLI for interacting with an Ollama server. It manages chat sessions and persists history locally, designed to be tiny and portable — ideal for lightweight systems and terminal users, but usable anywhere with Python and network access.
-
----
-
-## ✨ Features
-- Start and manage chat sessions with Ollama models
-- Persist session history locally under `sessions/`
-- Configure host, default model, and aliases via `config.json`
-- Add, remove, and list models with aliases (`lmConfig`)
-- Switch models mid‑session with confirmation
-- Atomic writes for safety (tmp + replace)
-- Streaming responses from Ollama for real‑time output
-- Graceful handling of Ctrl‑C interrupts
-
----
-
-## 📂 Project Structure
-
-```text
-lemonpie/
-├── lemonpie/          # Core package namespace
-│   ├── lm.py          # CLI session manager
-│   ├── lm_config.py   # Config manager
-│   ├── config.py      # Configuration logic & I/O
-│   ├── model_utils.py # Model finding & resolution
-│   ├── cli_utils.py   # Terminal helpers & confirmation
-│   └── ...            # Other shared modules
-├── config.example.json# Configuration template
-├── sessions/          # Session files (created at runtime)
-├── pyproject.toml     # Package & build configuration
-├── README.md          # Project overview
-├── LICENSE            # GPLv3 license
-└── .gitignore         # Ignore venv, sessions, local config
-```
-
----
-
-## ⚙️ Configuration (`config.json`)
-### Example structure:
-```json
-{
-  "server": "http://127.0.0.1:11434",
-  "default": "qwen2.5-coder:3b",
-  "models": [
-    { "alias": "qwen", "name": "qwen2.5-coder:3b" },
-    { "alias": null,   "name": "qwen2.5-coder:1.5b-base" }
-  ]
-}
-```
-server: Ollama host URL\
-default: canonical model name (full identifier)\
-models: list of objects with alias (nullable) and name
-
-
----
-
-## 🚀 Usage
-
-### lm.py
-- Start a new session \
-`lm -n "Hello"`
-
-- Start with a specific model\
-`lm -n -m qwen "Hello"`
-
-- Send a prompt to the current session\
-`lm "Tell me about git add"`
-
-- List sessions\
-`lm -l`
-
-- Print current session history\
-`lm -p`
-
-- Switch model in current session\
-`lm -m qwen2.5-coder:3b`
-
-### lmConfig.py
-- Manage models with lmConfig\
-`lmConfig --add-model qwen qwen2.5-coder:3b`\
-`lmConfig --list-models`\
-`lmConfig --remove-model qwen`
-
-
-## 🗺 Roadmap
-
-Planned features and improvements:
-
-- `lmConfig --init`  
-  Interactive setup command that:
-  - Prompts for Ollama server IP:port
-  - Verifies server reachability
-  - Lists available models if server responds
-  - Allows user to select models to add
-  - Handles cases where no models are found (with guidance to Ollama docs)
-  - Supports `--force` to override verification or alias conflicts
-
-- Model verification state machine  
-  Planned logic for `lmConfig --add-model`:
-  - Check server reachability
-  - Verify if model is installed
-  - Offer to pull missing models
-  - Handle pull success/failure and user choice
-  - Respect `--force` for overriding conflicts or skipping checks  
-  *(See docs/design/state-machine.md for full diagram once published)*
-
-- Enhanced error handling and user feedback
-  - Graceful handling of server errors (HTTP codes, non‑JSON responses)
-
-- Packaging for Debian (`.deb` via apt)
-- Future schema validation for config/session files
-
-
----
-
-## 📜 License
-
-This project is licensed under the **GNU General Public License v3.0** (**GPLv3**).You may redistribute and/or modify it under the terms of the GPL as published by the Free Software Foundation.See the [**license**](LICENSE) file for details.
-
-
----
-
+# LemonPie
+
+**The ultra‑lightweight Ollama session manager for terminal workflows**
+
+![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2FfamousStratum%2FLemonPie%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)
+![GitHub License](https://img.shields.io/github/license/famousstratum/lemonpie)
+
+LemonPie is a compact CLI for interacting with an Ollama server. It manages chat sessions and persists history locally, designed to be tiny and portable — ideal for lightweight systems and terminal users, but usable anywhere with Python and network access.
+
+---
+
+## ✨ Features
+- Start and manage chat sessions with Ollama models
+- Persist session history in your OS's standard user data directory
+- Configure host, default model, and aliases via a config file in your OS's standard user config directory
+- Add, remove, and list models with aliases (`lmConfig`)
+- Switch models mid‑session with confirmation
+- Atomic writes for safety (tmp + replace)
+- Streaming responses from Ollama for real‑time output
+- Graceful handling of Ctrl‑C interrupts
+
+---
+
+## 📂 Project Structure
+
+```text
+LemonPie/
+├── src/
+│   └── lemonpie/            # Core package namespace
+│       ├── main.py          # CLI session manager (entrypoints: lm, lemonpie)
+│       ├── config.py        # Configuration logic & I/O
+│       ├── paths.py         # OS-appropriate config/data directory resolution
+│       ├── model_utils.py   # Model finding & resolution
+│       ├── cli_utils.py     # Terminal helpers & confirmation
+│       ├── session_utils.py # Session persistence
+│       ├── spinner.py       # Status spinner
+│       ├── time_utils.py    # Timestamp helpers
+│       └── cli/
+│           └── config_cmd.py # Config manager (entrypoint: lmConfig)
+├── config.example.json      # Configuration template
+├── pyproject.toml           # Package & build configuration
+├── README.md                # Project overview
+├── LICENSE                  # GPLv3 license
+└── .gitignore
+```
+
+---
+
+## ⚙️ Configuration
+
+LemonPie keeps its config file and session history in your OS's standard user directories (via [`platformdirs`](https://pypi.org/project/platformdirs/)) — not in the project folder:
+
+|            | Linux                          | macOS                                       | Windows                     |
+|------------|---------------------------------|----------------------------------------------|------------------------------|
+| Config     | `~/.config/lemonpie/`           | `~/Library/Application Support/lemonpie/`     | `%LOCALAPPDATA%\lemonpie\`   |
+| Sessions   | `~/.local/share/lemonpie/sessions/` | `~/Library/Application Support/lemonpie/sessions/` | `%LOCALAPPDATA%\lemonpie\sessions\` |
+
+Both are overridable via environment variables — `LEMONPIE_CONFIG_DIR` and `LEMONPIE_SESSIONS_DIR` — useful for testing or running in a container.
+
+`config.example.json` at the repo root is a template. `lmConfig` will create your real config file on first use if one doesn't exist yet.
+
+### Example structure:
+```json
+{
+  "server": "http://127.0.0.1:11434",
+  "default": "qwen2.5-coder:3b",
+  "models": [
+    { "alias": "qwen", "name": "qwen2.5-coder:3b" },
+    { "alias": null,   "name": "qwen2.5-coder:1.5b-base" }
+  ]
+}
+```
+server: Ollama host URL\
+default: canonical model name (full identifier)\
+models: list of objects with alias (nullable) and name
+
+
+---
+
+## 🚀 Usage
+
+### `lm` / `lemonpie`
+- Start a new session \
+`lm -n "Hello"`
+
+- Start with a specific model\
+`lm -n -m qwen "Hello"`
+
+- Send a prompt to the current session\
+`lm "Tell me about git add"`
+
+- List sessions\
+`lm -l`
+
+- Print current session history\
+`lm -p`
+
+- Switch model in current session\
+`lm -m qwen2.5-coder:3b`
+
+### `lmConfig`
+- Manage models with lmConfig\
+`lmConfig --add-model qwen qwen2.5-coder:3b`\
+`lmConfig --list-models`\
+`lmConfig --remove-model qwen`
+
+
+## 🗺 Roadmap
+
+Planned features and improvements:
+
+- `lmConfig --init`  
+  Interactive setup command that:
+  - Prompts for Ollama server IP:port
+  - Verifies server reachability
+  - Lists available models if server responds
+  - Allows user to select models to add
+  - Handles cases where no models are found (with guidance to Ollama docs)
+  - Supports `--force` to override verification or alias conflicts
+
+- Model verification state machine  
+  Planned logic for `lmConfig --add-model`:
+  - Check server reachability
+  - Verify if model is installed
+  - Offer to pull missing models
+  - Handle pull success/failure and user choice
+  - Respect `--force` for overriding conflicts or skipping checks  
+  *(See docs/design/state-machine.md for full diagram once published)*
+
+- Enhanced error handling and user feedback
+  - Graceful handling of server errors (HTTP codes, non‑JSON responses)
+
+- Packaging for Debian (`.deb` via apt)
+- Future schema validation for config/session files
+
+
+---
+
+## 📜 License
+
+This project is licensed under the **GNU General Public License v3.0** (**GPLv3**).You may redistribute and/or modify it under the terms of the GPL as published by the Free Software Foundation.See the [**license**](LICENSE) file for details.
+
+
+---

{lemonpie_cli-0.1.0 → lemonpie_cli-0.2.0a1}/pyproject.toml

@@ -11,10 +11,12 @@ authors = [
 ]
 readme = "README.md"
 license = "GPL-3.0-or-later"
-requires-python = ">=3.8"
+requires-python = ">=3.11"
 
 dependencies = [
-  "ollama"
+  "ollama",
+  "httpx",
+  "platformdirs"
 ]
 
 [project.urls]
@@ -23,12 +25,15 @@ repository = "https://github.com/famousStratum/LemonPie"
 issues = "https://github.com/famousStratum/LemonPie/issues"
 
 [project.scripts]
-lm = "lemonpie.lm:main"
-lemonpie = "lemonpie.lm:main"
-lmConfig = "lemonpie.lm_config:main"
+lm = "lemonpie.main:main"
+lemonpie = "lemonpie.main:main"
+lmConfig = "lemonpie.cli.config_cmd:main"
 
 [tool.hatch.version]
 source = "vcs"
 
 [tool.hatch.build.hooks.vcs]
-version-file = "lemonpie/_version.py"
+version-file = "src/lemonpie/_version.py"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/lemonpie"]

{lemonpie_cli-0.1.0 → lemonpie_cli-0.2.0a1/src}/lemonpie/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.0'
-__version_tuple__ = version_tuple = (0, 1, 0)
+__version__ = version = '0.2.0a1'
+__version_tuple__ = version_tuple = (0, 2, 0, 'a1')
 
 __commit_id__ = commit_id = None

lemonpie_cli-0.1.0/lemonpie/lm.py → lemonpie_cli-0.2.0a1/src/lemonpie/main.py

@@ -48,6 +48,7 @@ from lemonpie.session_utils import (
     load_session_by_id,
     delete_session_by_id,
     delete_all_sessions,
+    resolve_session,
     close_session,
     load_session,
     save_session,

lemonpie_cli-0.2.0a1/src/lemonpie/paths.py

@@ -0,0 +1,26 @@
+import os
+from platformdirs import user_config_dir, user_data_dir
+
+APP_NAME = "lemonpie"
+
+# Config directory: OS-appropriate user config location
+# (~/.config/lemonpie, %LOCALAPPDATA%\lemonpie, ~/Library/Application Support/lemonpie).
+# Override with $LEMONPIE_CONFIG_DIR.
+CONFIG_DIR = os.environ.get(
+    "LEMONPIE_CONFIG_DIR",
+    user_config_dir(APP_NAME, appauthor=False)
+)
+os.makedirs(CONFIG_DIR, exist_ok=True)
+
+CONFIG_FILE = os.path.join(CONFIG_DIR, "config.json")
+
+# Sessions directory: OS-appropriate user data location, with precedence given
+# to $LEMONPIE_SESSIONS_DIR for backward compatibility / testing / containers.
+DATA_DIR = user_data_dir(APP_NAME, appauthor=False)
+SESSIONS_DIR = os.environ.get(
+    "LEMONPIE_SESSIONS_DIR",
+    os.path.join(DATA_DIR, "sessions")
+)
+os.makedirs(SESSIONS_DIR, exist_ok=True)
+
+CURRENT_FILE = os.path.join(SESSIONS_DIR, ".current")