lemonpie-cli 0.2.0a1__tar.gz → 0.2.0b1__tar.gz

lemonpie_cli-0.2.0a1/.github/workflows/publish.yml → lemonpie_cli-0.2.0b1/.github/workflows/ci.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - main
-    tags:
-      - "v*"
   pull_request:
     branches:
       - main
@@ -29,3 +27,6 @@ jobs:
 
       - name: Verify build artifact
         run: uv build
+
+      - name: Run tests
+        run: uv run pytest

lemonpie_cli-0.2.0b1/.github/workflows/release.yml

@@ -0,0 +1,65 @@
+name: Release & Publish
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pull-requests: write
+  id-token: write
+
+jobs:
+  release-please:
+    name: Manage Release PR & Tags
+    runs-on: ubuntu-latest
+    outputs:
+      release_created: ${{ steps.release.outputs.releases_created }}
+      tag_name: ${{ steps.release.outputs.tag_name }}
+    steps:
+      - uses: googleapis/release-please-action@v4
+        id: release
+        with:
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
+          config-file: .release-please/config.json
+          manifest-file: .release-please/manifest.json
+
+  pypi-publish:
+    name: Build and publish to PyPI
+    needs: release-please
+    if: ${{ needs.release-please.outputs.release_created == 'true' }}
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write # Required for Trusted Publisher OIDC authentication
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0 # Required for hatch-vcs to inspect git history & tags
+
+      - name: Verify tag is reachable from main
+        run: |
+          git fetch origin main
+          if git merge-base --is-ancestor "${{ github.sha }}" origin/main; then
+            echo "Commit ${{ github.sha }} is on main. Proceeding."
+          else
+            echo "::error::Commit ${{ github.sha }} is not reachable from origin/main. Refusing to publish."
+            exit 1
+          fi
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        with:
+          version: "0.12.17"
+
+      - name: Set up Python
+        run: uv python install
+
+      - name: Build package artifacts
+        run: uv build
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

lemonpie_cli-0.2.0b1/.release-please/config.json

@@ -0,0 +1,14 @@
+{
+  "release-type": "python",
+  "packages": {
+    ".": {
+      "package-name": "lemonpie-cli",
+      "changelog-path": "CHANGELOG.md",
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "prerelease": true,
+      "versioning": "prerelease",
+      "include-component-in-tag": false
+    }
+  }
+}

lemonpie_cli-0.2.0b1/.release-please/manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.2.0-beta.1"
+}

lemonpie_cli-0.2.0b1/CHANGELOG.md

@@ -0,0 +1,42 @@
+# Changelog
+
+## [0.2.0-beta.1](https://github.com/famousStratum/LemonPie/compare/v0.2.0-alpha.3...v0.2.0-beta.1) (2026-09-22)
+
+
+### Bug Fixes
+
+* eliminate now_ts() double-calls and session ID collisions in session creation ([#27](https://github.com/famousStratum/LemonPie/issues/27)) ([7864136](https://github.com/famousStratum/LemonPie/commit/7864136b6dc200e1e682b61252eadc74e99ac66a))
+
+## [0.2.0-alpha.3](https://github.com/famousStratum/LemonPie/compare/v0.2.0-alpha.2...v0.2.0-alpha.3) (2026-09-21)
+
+
+### Bug Fixes
+
+* resolve tuple/dict mismatch in model alias lookup and dead code in session loading ([#23](https://github.com/famousStratum/LemonPie/issues/23)) ([65152bf](https://github.com/famousStratum/LemonPie/commit/65152bf9d6df0d91addad5aa72f73145383b99d9))
+
+## [0.2.0-alpha.2](https://github.com/famousStratum/LemonPie/compare/lemonpie-cli-v0.2.0-alpha.1...lemonpie-cli-v0.2.0-alpha.2) (2026-09-21)
+
+
+### Features
+
+* **cli:** enhance error handling, model defaults, timeouts, and connection status ([9147dc0](https://github.com/famousStratum/LemonPie/commit/9147dc0293065f0b2227ac8f36cdacf0502ca7c4))
+* **cli:** improve connection error handling, timeouts, and documentation ([83e2659](https://github.com/famousStratum/LemonPie/commit/83e2659182717d82feb28be4b85d14e85679d751))
+* **paths:** Depend on platformdirs for config/session paths; bump requires-python to >=3.11 ([6fbf8e9](https://github.com/famousStratum/LemonPie/commit/6fbf8e92d27cbec20c57f404aecf99940329b238))
+
+
+### Bug Fixes
+
+* **build:** explicitly specify hatchling wheel package directory ([705980a](https://github.com/famousStratum/LemonPie/commit/705980a9eda1672829119db0fcd2aab4a9c04101))
+* **build:** specify hatchling package target ([b759f2d](https://github.com/famousStratum/LemonPie/commit/b759f2d086bccb7b39d456844d1bb7403410e8d4))
+* **cli:** import missing resolve_session in main entrypoint ([f5c4c5a](https://github.com/famousStratum/LemonPie/commit/f5c4c5ae1cc7ade21ba41eb92a9ecc640a7fe969))
+* **cli:** reorder main entrypoint control flow and fix argument handling ([3a182d2](https://github.com/famousStratum/LemonPie/commit/3a182d2485af36f8a98a28cb41459f968fc9f4d4))
+* **cli:** reorder main entrypoint control flow and resolve model assignment ([ad944f9](https://github.com/famousStratum/LemonPie/commit/ad944f93e2661eb3f2cc1abfe6cdeedc04f6ee86))
+* **cli:** resolve NameError in main entrypoint ([532d661](https://github.com/famousStratum/LemonPie/commit/532d6617ff589de5f5def690e6390b1341517f84))
+
+
+### Documentation
+
+* Add roadmap section to README and initial state-machine design doc ([fa9b000](https://github.com/famousStratum/LemonPie/commit/fa9b0009aaca85cbcd3e5a6f1e1c6c4d3bc40196))
+* update README for src/ layout and platformdirs ([a15cde2](https://github.com/famousStratum/LemonPie/commit/a15cde25a08c49d11366bc64c31aa80da9590838))
+* update README.md ([cf7a046](https://github.com/famousStratum/LemonPie/commit/cf7a0468474cc6bb47dbf33148a6b18d11b44fdf))
+* update roadmap in README.md ([d0a3316](https://github.com/famousStratum/LemonPie/commit/d0a33167361efd400682f54780aaf3fff738e41d))

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lemonpie-cli
-Version: 0.2.0a1
+Version: 0.2.0b1
 Summary: LemonPie — A lightweight Ollama client for terminal users
 Project-URL: homepage, https://versicode.com/lemonpie
 Project-URL: repository, https://github.com/famousStratum/LemonPie

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

@@ -37,3 +37,10 @@ version-file = "src/lemonpie/_version.py"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/lemonpie"]
+
+[dependency-groups]
+dev = ["pytest>=8.0"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "-ra"

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

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

{lemonpie_cli-0.2.0a1 → lemonpie_cli-0.2.0b1}/src/lemonpie/cli/config_cmd.py

@@ -15,8 +15,8 @@ import argparse, json, os, sys
 from urllib.parse import urlparse
 
 from lemonpie.paths import CONFIG_FILE
-from lemonpie.cli_utils import confirm
-from lemonpie.model_utils import (
+from lemonpie.cli.ui import confirm
+from lemonpie.engine.models import (
     find_by_alias,
     find_by_name,
 )
@@ -196,7 +196,7 @@ def cmd_show(cfg):
     return 0
 
 
-def main():
+def build_parser():
     parser = argparse.ArgumentParser(prog="lmConfig", description="Manage LemonPie configuration (config.json)")
     parser.add_argument("--host", help="Set Ollama host URL (http(s)://host:port)")
     parser.add_argument("--default-model", help="Set default model using alias or full name (must exist in models)")
@@ -205,6 +205,11 @@ def main():
     parser.add_argument("--list-models", action="store_true", help="List configured model aliases and names")
     parser.add_argument("--show", action="store_true", help="Print full config.json")
     parser.add_argument("--force", action="store_true", help="Force overwrite when adding a model")
+    return parser
+
+
+def main():
+    parser = build_parser()
     args = parser.parse_args()
 
     cfg = load_config()

lemonpie_cli-0.2.0a1/src/lemonpie/cli_utils.py → lemonpie_cli-0.2.0b1/src/lemonpie/cli/parser.py

@@ -1,12 +1,11 @@
 import argparse
 
-from lemonpie.session_utils import list_sessions, read_current
-
 try:
     from lemonpie._version import __version__
 except ImportError:
     __version__ = "0.0.0.dev0"
 
+
 def build_parser():
     parser = argparse.ArgumentParser(prog="lm", description="Run LemonPie with a given model or prompt")
     parser.add_argument("-v", "--version", action="version", version=f"%(prog)s {__version__}")
@@ -21,22 +20,3 @@ def build_parser():
     parser.add_argument("--delete-all", action="store_true", help="Delete all stored sessions")
     parser.add_argument("prompt", nargs="*", help="Prompt text")
     return parser
-
-def confirm(prompt):
-    ans = input(f"{prompt} (y/N): ").strip().lower()
-    return ans in ("y", "yes")
-
-def print_session(session):
-    print(f"Session {session['id']} — {session.get('title') or '<no title>'}")
-    for turn in session["history"]:
-        role = turn["role"]
-        content = turn["content"]
-        print(f"{role} [{turn.get('ts','')}] : {content}")
-
-def print_sessions_list():
-    sessions = list_sessions()
-    if not sessions:
-        print("No sessions found.")
-        return
-    for sid, title, created, updated, is_current in sessions:
-        print(f"{is_current} {sid}  {title} created: {created}, updated: {updated}")

lemonpie_cli-0.2.0a1/src/lemonpie/spinner.py → lemonpie_cli-0.2.0b1/src/lemonpie/cli/ui.py

@@ -1,17 +1,45 @@
-import sys, time, random, threading
+import random
+import sys
+import threading
+import time
+
+from lemonpie.sessions.storage import list_sessions
 
 CONNECTING_MSGS = [
     "Connecting",
     "Squeezing the lemons",
-    "Knocking on Ollama’s door"
+    "Knocking on Ollama’s door",
 ]
 
 WAITING_MSGS = [
     "Waiting for model response",
     "The pie is cooking",
-    "Brewing tokens"
+    "Brewing tokens",
 ]
 
+
+def confirm(prompt):
+    ans = input(f"{prompt} (y/N): ").strip().lower()
+    return ans in ("y", "yes")
+
+
+def print_session(session):
+    print(f"Session {session['id']} — {session.get('title') or '<no title>'}")
+    for turn in session["history"]:
+        role = turn["role"]
+        content = turn["content"]
+        print(f"{role} [{turn.get('ts', '')}] : {content}")
+
+
+def print_sessions_list():
+    sessions = list_sessions()
+    if not sessions:
+        print("No sessions found.")
+        return
+    for sid, title, created, updated, is_current in sessions:
+        print(f"{is_current} {sid}  {title} created: {created}, updated: {updated}")
+
+
 class StatusSpinner:
     def __init__(self, messages, interval=0.5):
         self.messages = messages

lemonpie_cli-0.2.0a1/src/lemonpie/model_utils.py → lemonpie_cli-0.2.0b1/src/lemonpie/engine/models.py

@@ -1,19 +1,44 @@
 import sys
 
+from lemonpie.sessions.storage import save_session
 
-from lemonpie.session_utils import save_session
+
+def find_by_alias(cfg, alias):
+    for idx, m in enumerate(cfg.get("models", [])):
+        if m.get("alias") == alias:
+            return idx, m
+    return None, None
+
+
+def find_by_name(cfg, name):
+    for idx, m in enumerate(cfg.get("models", [])):
+        if m.get("name") == name:
+            return idx, m
+    return None, None
+
+
+def resolve_model(cfg, args_model, default_model_name):
+    if args_model:
+        _, alias_entry = find_by_alias(cfg, args_model)
+        if alias_entry:
+            return alias_entry["name"]
+        _, name_entry = find_by_name(cfg, args_model)
+        if name_entry:
+            return name_entry["name"]
+        return args_model
+    return default_model_name
 
 
 def handle_model_switch(cfg, session, requested_model):
     """
-    Handles validating a requested model/alias and updates the active session 
+    Handles validating a requested model/alias and updates the active session
     if confirmed by the user.
     """
     if not session or not requested_model:
         return session
 
-    alias_entry = find_by_alias(cfg, requested_model)
-    name_entry = find_by_name(cfg, requested_model)
+    _, alias_entry = find_by_alias(cfg, requested_model)
+    _, name_entry = find_by_name(cfg, requested_model)
 
     if alias_entry:
         new_model = alias_entry["name"]
@@ -34,29 +59,3 @@ def handle_model_switch(cfg, session, requested_model):
             print("Aborted model change.")
 
     return session
-
-
-def find_by_alias(cfg, alias):
-    for idx, m in enumerate(cfg.get("models", [])):
-        if m.get("alias") == alias:
-            return idx, m
-    return None, None
-
-
-def find_by_name(cfg, name):
-    for idx, m in enumerate(cfg.get("models", [])):
-        if m.get("name") == name:
-            return idx, m
-    return None, None
-
-
-def resolve_model(cfg, args_model, default_model_name):
-    if args_model:
-        alias_entry = find_by_alias(cfg, args_model)
-        if alias_entry:
-            return alias_entry["name"]
-        name_entry = find_by_name(cfg, args_model)
-        if name_entry:
-            return name_entry["name"]
-        return args_model
-    return default_model_name

lemonpie_cli-0.2.0b1/src/lemonpie/engine/ollama.py

@@ -0,0 +1,49 @@
+"""Ollama API interaction abstractions: client construction and streaming chat."""
+
+from ollama import Client
+
+
+def build_client(server_host, timeout):
+    return Client(host=server_host, timeout=timeout)
+
+
+def stream_chat(client, model, messages):
+    """
+    Stream a chat completion from Ollama, yielding text content chunks.
+
+    The underlying stream is closed automatically when this generator is
+    closed (e.g. via a `for` loop finishing, an exception propagating, or an
+    explicit `.close()` call on the generator by the caller).
+    """
+    stream = client.chat(model=model, messages=messages, stream=True)
+    try:
+        for chunk in stream:
+            # Standard Ollama client attribute access
+            content = getattr(getattr(chunk, "message", None), "content", None)
+            if content is None and isinstance(chunk, dict):
+                content = chunk.get("message", {}).get("content", "")
+            if content:
+                yield content
+    finally:
+        if hasattr(stream, "close"):
+            stream.close()
+
+
+def resolve_ollama_error(exc, server_host):
+    """
+    Map an exception raised during an Ollama request to a (message, hint)
+    pair suitable for printing to the user. `hint` may be None.
+    """
+    msg = str(exc)
+    if "[Errno 111]" in msg or "Connection refused" in msg:
+        return (
+            "Ollama server did not respond: Connection refused.",
+            f"Hint: Ollama may not be running, or it may not be listening on: {server_host}\n"
+            "Check that the server is started with `ollama serve` and bound to the correct interface.",
+        )
+    if "[Errno 110]" in msg or "timed out" in msg.lower():
+        return (
+            "Failed to contact Ollama server: Connection timed out.",
+            f"Hint: The server at {server_host} is unreachable. Verify IP/port and network.",
+        )
+    return (f"Failed to contact Ollama server: {msg}", None)

{lemonpie_cli-0.2.0a1 → lemonpie_cli-0.2.0b1}/src/lemonpie/main.py

@@ -17,11 +17,7 @@ Quick usage
 See README.md for details and maintainer notes.
 """
 
-import argparse, errno, httpx, json, os, sys
-from datetime import datetime, timezone
-from ollama import Client
-
-from lemonpie.paths import CURRENT_FILE, SESSIONS_DIR
+import sys
 
 from lemonpie.config import (
     load_config,
@@ -29,55 +25,46 @@ from lemonpie.config import (
     build_timeout,
 )
 
-from lemonpie.cli_utils import (
-    build_parser,
-    list_sessions,
+from lemonpie.cli.parser import build_parser
+from lemonpie.cli.ui import (
     print_session,
     print_sessions_list,
+    StatusSpinner,
+    CONNECTING_MSGS,
+    WAITING_MSGS,
 )
 
-from lemonpie.model_utils import (
-    find_by_alias,
+from lemonpie.engine.models import (
     find_by_name,
     handle_model_switch,
     resolve_model,
 )
 
-from lemonpie.session_utils import (
-    create_session,
-    load_session_by_id,
+from lemonpie.engine.ollama import (
+    build_client,
+    stream_chat,
+    resolve_ollama_error,
+)
+
+from lemonpie.sessions.storage import (
     delete_session_by_id,
     delete_all_sessions,
     resolve_session,
     close_session,
     load_session,
     save_session,
-    delete_session,
     read_current,
-    write_current,
-    clear_current,
-    default_title,
-    set_title,
     update_title,
 )
 
-from lemonpie.spinner import (
-    StatusSpinner,
-    CONNECTING_MSGS,
-    WAITING_MSGS,
-)
-
 from lemonpie.time_utils import now_ts
 
-cfg = load_config()
-server_host = resolve_server_host(cfg)
-timeout = build_timeout()
-client = Client(host=server_host, timeout=timeout)
-
-models_list = cfg["models"]
-default_model_name = cfg.get("default") or None
-
 def main():
+    cfg = load_config()
+    server_host = resolve_server_host(cfg)
+    timeout = build_timeout()
+    client = build_client(server_host, timeout)
+    default_model_name = cfg.get("default") or None
     parser = build_parser()
     args = parser.parse_args()
 
@@ -85,18 +72,9 @@ def main():
         parser.print_help()
         sys.exit(1)
 
-    model_flag = any(a in ("-m", "--model") for a in sys.argv[1:])
-    resolve_model(cfg, args.model, default_model_name)
-
-    model = default_model_name
-    if model is None:
-        print("No default model configured.")
-        print("Use lmConfig to add one or pass a known alias with -m.")
-        sys.exit(1)
-
     current_id = read_current()
 
-    # Direct CLI actions
+        # Direct CLI actions
 
     if args.list:
         print_sessions_list(); sys.exit(0)
@@ -122,10 +100,18 @@ def main():
         confirm = input("Are you sure you want to delete ALL sessions? (y/N): ")
         if confirm.lower() in ("y", "yes"):
             count = delete_all_sessions()
-            print(f"Deleted {count} session(s).")
+            print(f"Deleted {count} session(s)."); sys.exit(0)
         else:
             print("Aborted."); sys.exit(0)
 
+    model_flag = args.model is not None
+    model = resolve_model(cfg, args.model, default_model_name)
+
+    if model is None:
+        print("No default model configured.")
+        print("Use lmConfig to add one or pass a known alias with -m.")
+        sys.exit(1)
+
     if model_flag and not current_id and not args.new and not args.session and not args.prompt:
         print(f'No current session.\n'
               f'To create a new session with "{args.model}" use: lm -n -m {args.model}\n'
@@ -141,17 +127,15 @@ def main():
 
     if args.title:
         session = update_title(session, model, args.title, args.prompt)
+        if not args.prompt:
+            sys.exit(0)
 
     if args.prompt:
         user_prompt = " ".join(args.prompt)
         turn_ts = now_ts()
-        if session:
-            session["history"].append({"role": "user", "content": user_prompt, "ts": turn_ts})
-            session["updated_at"] = turn_ts
-            save_session(session_id, session)
-        else:
-            session = create_session(user_prompt, model)
-            session_id = session["id"]
+        session["history"].append({"role": "user", "content": user_prompt, "ts": turn_ts})
+        session["updated_at"] = turn_ts
+        save_session(session_id, session)
 
         if not find_by_name(cfg, model):
             print(f'Configured models do not include "{model}". Use lmConfig to add it or pass a known alias.')
@@ -163,50 +147,28 @@ def main():
         assistant_reply = ""
         reply_ts = None
         first_chunk_seen = False
+        chunks = stream_chat(client, model, session["history"])
 
         try:
-            stream = client.chat(model=model, messages=session["history"], stream=True)
-            spinner.stop()
-
-            spinner = StatusSpinner(WAITING_MSGS)
-            spinner.start()
-
-            for chunk in stream:
+            for content in chunks:
                 if not first_chunk_seen:
                     spinner.stop()
                     first_chunk_seen = True
-
-                # Standard Ollama client attribute access
-                content = getattr(getattr(chunk, "message", None), "content", None)
-                if content is None and isinstance(chunk, dict):
-                    content = chunk.get("message", {}).get("content", "")
-
-                if content:
-                    print(content, end="", flush=True)
-                    assistant_reply += content
+                print(content, end="", flush=True)
+                assistant_reply += content
             print()
             reply_ts = now_ts()
 
         except KeyboardInterrupt:
-            try:
-                if 'stream' in locals() and hasattr(stream, "close"):
-                    stream.close()
-            except Exception:
-                pass
+            chunks.close()
             print("\nInterrupted by user.")
             sys.exit(1)
 
         except Exception as e:
-            msg = str(e)
-            if "[Errno 111]" in msg or "Connection refused" in msg:
-                print("\nOllama server did not respond: Connection refused.")
-                print("Hint: Ollama may not be running, or it may not be listening on:", server_host)
-                print("Check that the server is started with `ollama serve` and bound to the correct interface.")
-            elif "[Errno 110]" in msg or "timed out" in msg.lower():
-                print("\nFailed to contact Ollama server: Connection timed out.")
-                print("Hint: The server at", server_host, "is unreachable. Verify IP/port and network.")
-            else:
-                print("\nFailed to contact Ollama server:", msg)
+            title, hint = resolve_ollama_error(e, server_host)
+            print("\n" + title)
+            if hint:
+                print(hint)
             sys.exit(1)
 
         finally: