Reorg

Signed-off-by: Alina Buzachis <[email protected]>

Author: alinabuzachis

core/migrations/0005_remove_task_updated_at.py

@@ -2,10 +2,11 @@
 import logging
 import os
 
+from core.utils.controller import build_collection_uri
+from core.utils.controller import download_collection
+
 from .models import Pattern
 from .models import Task
-from .utils import build_collection_uri
-from .utils import download_collection
 
 logger = logging.getLogger(__name__)
 

core/migrations/0006_task_updated_at.py

@@ -1,4 +1,4 @@
-import core.controller_client as cc
+import core.utils.controller.client as cc
 
 
 def test_get_http_session():

core/task_runner.py

@@ -0,0 +1,3 @@
+from .http_helpers import validate_url
+
+__all__ = ["validate_url"]

core/tests/test_controller_client.py

@@ -0,0 +1,7 @@
+from .helpers import build_collection_uri
+from .helpers import download_collection
+
+__all__ = [
+    "build_collection_uri",
+    "download_collection",
+]

core/utils/__init__.py

@@ -6,25 +6,14 @@
 import tempfile
 from typing import Iterator
 from urllib.parse import urljoin
-from urllib.parse import urlparse
 
 from django.conf import settings
 
-from .controller_client import get
+from .client import get
 
 logger = logging.getLogger(__name__)
 
 
-def validate_url(url: str) -> str:
-    """Ensure the URL has a valid scheme and format."""
-    if not url.startswith(("http://", "https://")):
-        url = f"http://{url}"
-    parsed = urlparse(url)
-    if not parsed.scheme or not parsed.netloc:
-        raise ValueError(f"Invalid URL: {url}")
-    return url.rstrip("/")
-
-
 def build_collection_uri(collection: str, version: str) -> str:
     """
     Builds the full URI for a given collection and version.

core/utils/controller/__init__.py

@@ -0,0 +1,14 @@
+import logging
+from urllib.parse import urlparse
+
+logger = logging.getLogger(__name__)
+
+
+def validate_url(url: str) -> str:
+    """Ensure the URL has a valid scheme and format."""
+    if not url.startswith(("http://", "https://")):
+        url = f"http://{url}"
+    parsed = urlparse(url)
+    if not parsed.scheme or not parsed.netloc:
+        raise ValueError(f"Invalid URL: {url}")
+    return url.rstrip("/")