Merge pull request #63 from jkoelker/jk/refactor

refactor(civitai): extract parse_civitai_url

Author: jkoelker

src/oneiro/bot.py

@@ -9,7 +9,7 @@
 import discord
 from discord import option
 
-from oneiro.civitai import CivitaiClient, CivitaiError
+from oneiro.civitai import CivitaiClient, CivitaiError, parse_civitai_url
 from oneiro.config import Config
 from oneiro.filters import ContentFilter
 from oneiro.lora_detector import AutoLoraDetector, create_detector_from_config
@@ -21,7 +21,7 @@
     PipelineManager,
 )
 from oneiro.pipelines.civitai_checkpoint import CivitaiCheckpointPipeline
-from oneiro.pipelines.lora import is_lora_compatible, parse_civitai_url
+from oneiro.pipelines.lora import is_lora_compatible
 from oneiro.queue import GenerationQueue, QueueStatus
 
 # Global managers (initialized on bot ready)

src/oneiro/civitai.py

@@ -4,6 +4,7 @@
 import hashlib
 import json
 import os
+import re
 import shutil
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
@@ -63,6 +64,38 @@ class BaseModel(str, Enum):
     FLUX_1 = "Flux.1"
 
 
+def parse_civitai_url(url: str) -> tuple[int, int | None]:
+    """Parse Civitai URL to extract model ID and optional version ID.
+
+    Supports formats:
+    - https://civitai.com/models/12345
+    - https://civitai.com/models/12345/model-name
+    - https://civitai.com/models/12345?modelVersionId=67890
+    - https://civitai.com/models/12345/name?modelVersionId=67890
+
+    Args:
+        url: Civitai model URL
+
+    Returns:
+        Tuple of (model_id, version_id or None)
+
+    Raises:
+        ValueError: If URL format is invalid
+    """
+    # Match model ID in path
+    model_match = re.search(r"/models/(\d+)", url)
+    if not model_match:
+        raise ValueError(f"Invalid Civitai URL format: {url}")
+
+    model_id = int(model_match.group(1))
+
+    # Check for version in query string
+    version_match = re.search(r"modelVersionId=(\d+)", url)
+    version_id = int(version_match.group(1)) if version_match else None
+
+    return model_id, version_id
+
+
 @dataclass
 class ModelFile:
     """Represents a downloadable file in a model version."""

src/oneiro/pipelines/embedding.py

@@ -1,12 +1,11 @@
 """Textual inversion / embedding configuration types and loading utilities."""
 
-import re
 from dataclasses import dataclass, field
 from enum import Enum
 from pathlib import Path
 from typing import Any
 
-from oneiro.civitai import CivitaiClient
+from oneiro.civitai import CivitaiClient, parse_civitai_url
 from oneiro.pipelines.lora import PIPELINE_BASE_MODEL_MAP
 
 
@@ -69,38 +68,6 @@ def __post_init__(self) -> None:
                 raise ValueError("local source requires path")
 
 
-def parse_civitai_url(url: str) -> tuple[int, int | None]:
-    """Parse Civitai URL to extract model ID and optional version ID.
-
-    Supports formats:
-    - https://civitai.com/models/12345
-    - https://civitai.com/models/12345/model-name
-    - https://civitai.com/models/12345?modelVersionId=67890
-    - https://civitai.com/models/12345/name?modelVersionId=67890
-
-    Args:
-        url: Civitai model URL
-
-    Returns:
-        Tuple of (model_id, version_id or None)
-
-    Raises:
-        ValueError: If URL format is invalid
-    """
-    # Match model ID in path
-    model_match = re.search(r"/models/(\d+)", url)
-    if not model_match:
-        raise ValueError(f"Invalid Civitai URL format: {url}")
-
-    model_id = int(model_match.group(1))
-
-    # Check for version in query string
-    version_match = re.search(r"modelVersionId=(\d+)", url)
-    version_id = int(version_match.group(1)) if version_match else None
-
-    return model_id, version_id
-
-
 def parse_embedding_config(
     config: dict[str, Any] | str, name: str | None = None
 ) -> EmbeddingConfig:

src/oneiro/pipelines/lora.py

@@ -1,12 +1,11 @@
 """LoRA configuration types and loading utilities."""
 
-import re
 from dataclasses import dataclass, field
 from enum import Enum
 from pathlib import Path
 from typing import Any
 
-from oneiro.civitai import CivitaiClient
+from oneiro.civitai import CivitaiClient, parse_civitai_url
 
 
 class LoraSource(str, Enum):
@@ -80,38 +79,6 @@ def __post_init__(self) -> None:
                 raise ValueError("local source requires path")
 
 
-def parse_civitai_url(url: str) -> tuple[int, int | None]:
-    """Parse Civitai URL to extract model ID and optional version ID.
-
-    Supports formats:
-    - https://civitai.com/models/12345
-    - https://civitai.com/models/12345/model-name
-    - https://civitai.com/models/12345?modelVersionId=67890
-    - https://civitai.com/models/12345/name?modelVersionId=67890
-
-    Args:
-        url: Civitai model URL
-
-    Returns:
-        Tuple of (model_id, version_id or None)
-
-    Raises:
-        ValueError: If URL format is invalid
-    """
-    # Match model ID in path
-    model_match = re.search(r"/models/(\d+)", url)
-    if not model_match:
-        raise ValueError(f"Invalid Civitai URL format: {url}")
-
-    model_id = int(model_match.group(1))
-
-    # Check for version in query string
-    version_match = re.search(r"modelVersionId=(\d+)", url)
-    version_id = int(version_match.group(1)) if version_match else None
-
-    return model_id, version_id
-
-
 def parse_lora_config(config: dict[str, Any] | str, index: int = 0) -> LoraConfig:
     """Parse a LoRA configuration from TOML config format.
 

tests/test_civitai.py

@@ -17,8 +17,47 @@
     ModelFile,
     ModelType,
     ModelVersion,
+    parse_civitai_url,
 )
 
+
+class TestParseCivitaiUrl:
+    """Tests for parse_civitai_url function."""
+
+    def test_basic_model_url(self):
+        """Parses basic model URL."""
+        model_id, version_id = parse_civitai_url("https://civitai.com/models/12345")
+        assert model_id == 12345
+        assert version_id is None
+
+    def test_model_url_with_name(self):
+        """Parses model URL with name slug."""
+        model_id, version_id = parse_civitai_url("https://civitai.com/models/12345/my-cool-model")
+        assert model_id == 12345
+        assert version_id is None
+
+    def test_model_url_with_version(self):
+        """Parses model URL with version ID in query string."""
+        model_id, version_id = parse_civitai_url(
+            "https://civitai.com/models/12345?modelVersionId=67890"
+        )
+        assert model_id == 12345
+        assert version_id == 67890
+
+    def test_model_url_with_name_and_version(self):
+        """Parses model URL with name and version."""
+        model_id, version_id = parse_civitai_url(
+            "https://civitai.com/models/12345/model-name?modelVersionId=67890"
+        )
+        assert model_id == 12345
+        assert version_id == 67890
+
+    def test_invalid_url_raises(self):
+        """Invalid URL raises ValueError."""
+        with pytest.raises(ValueError, match="Invalid Civitai URL"):
+            parse_civitai_url("https://example.com/something")
+
+
 # Sample API responses for testing
 SAMPLE_MODEL_RESPONSE = {
     "id": 12345,

tests/test_embedding.py

@@ -11,49 +11,11 @@
     EmbeddingIncompatibleError,
     EmbeddingSource,
     is_embedding_compatible,
-    parse_civitai_url,
     parse_embedding_config,
     parse_embeddings_from_config,
 )
 
 
-class TestParseCivitaiUrl:
-    """Tests for parse_civitai_url function."""
-
-    def test_basic_model_url(self):
-        """Parses basic model URL."""
-        model_id, version_id = parse_civitai_url("https://civitai.com/models/12345")
-        assert model_id == 12345
-        assert version_id is None
-
-    def test_model_url_with_name(self):
-        """Parses model URL with name slug."""
-        model_id, version_id = parse_civitai_url("https://civitai.com/models/12345/my-cool-model")
-        assert model_id == 12345
-        assert version_id is None
-
-    def test_model_url_with_version(self):
-        """Parses model URL with version ID in query string."""
-        model_id, version_id = parse_civitai_url(
-            "https://civitai.com/models/12345?modelVersionId=67890"
-        )
-        assert model_id == 12345
-        assert version_id == 67890
-
-    def test_model_url_with_name_and_version(self):
-        """Parses model URL with name and version."""
-        model_id, version_id = parse_civitai_url(
-            "https://civitai.com/models/12345/model-name?modelVersionId=67890"
-        )
-        assert model_id == 12345
-        assert version_id == 67890
-
-    def test_invalid_url_raises(self):
-        """Invalid URL raises ValueError."""
-        with pytest.raises(ValueError, match="Invalid Civitai URL"):
-            parse_civitai_url("https://example.com/something")
-
-
 class TestEmbeddingConfig:
     """Tests for EmbeddingConfig dataclass."""
 

tests/test_lora.py

@@ -11,50 +11,12 @@
     LoraIncompatibleError,
     LoraSource,
     is_lora_compatible,
-    parse_civitai_url,
     parse_lora_config,
     parse_loras_from_config,
     parse_loras_from_model_config,
 )
 
 
-class TestParseCivitaiUrl:
-    """Tests for parse_civitai_url function."""
-
-    def test_basic_model_url(self):
-        """Parses basic model URL."""
-        model_id, version_id = parse_civitai_url("https://civitai.com/models/12345")
-        assert model_id == 12345
-        assert version_id is None
-
-    def test_model_url_with_name(self):
-        """Parses model URL with name slug."""
-        model_id, version_id = parse_civitai_url("https://civitai.com/models/12345/my-cool-model")
-        assert model_id == 12345
-        assert version_id is None
-
-    def test_model_url_with_version(self):
-        """Parses model URL with version ID in query string."""
-        model_id, version_id = parse_civitai_url(
-            "https://civitai.com/models/12345?modelVersionId=67890"
-        )
-        assert model_id == 12345
-        assert version_id == 67890
-
-    def test_model_url_with_name_and_version(self):
-        """Parses model URL with name and version."""
-        model_id, version_id = parse_civitai_url(
-            "https://civitai.com/models/12345/model-name?modelVersionId=67890"
-        )
-        assert model_id == 12345
-        assert version_id == 67890
-
-    def test_invalid_url_raises(self):
-        """Invalid URL raises ValueError."""
-        with pytest.raises(ValueError, match="Invalid Civitai URL"):
-            parse_civitai_url("https://example.com/something")
-
-
 class TestLoraConfig:
     """Tests for LoraConfig dataclass."""