semantics: complete DEF-to-region migration, fix regressions
- Convert legacy [DEF🆔Type] anchors to #region/#endregion across 329 files
- Reinstate _normalize_timestamp_value in sql_generator.py
- Fix MarkerLogger→logger migration in events.py (molecular CoT markers)
- Fix dataset_review orchestrator dependencies (_build_execution_snapshot)
- Fix config_manager stale-record deletion (moved to save path only)
- Add 77 missing [/DEF:] closers in 5 unbalanced test files
- Update assistant_chat.integration.test.js for #region format
- Apply molecular-cot-logging markers (REASON/REFLECT/EXPLORE) via logger.* methods
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# #region GitServiceUrlMixin [C:3] [TYPE Module] [SEMANTICS git, url, parsing, normalization, host_alignment]
|
||||
# @LAYER: Infra
|
||||
# @BRIEF URL helper mixin for GitService — parse, normalize, align, and strip credentials from Git URLs.
|
||||
# @LAYER Infra
|
||||
# @RELATION USED_BY -> [GitServiceSyncMixin]
|
||||
# @RELATION USED_BY -> [GitServiceGiteaMixin]
|
||||
# @RELATION USED_BY -> [GitServiceRemoteMixin]
|
||||
@@ -10,20 +10,17 @@ from typing import Any, Dict, List, Optional
|
||||
from urllib.parse import quote, urlparse
|
||||
from fastapi import HTTPException
|
||||
from src.core.database import SessionLocal
|
||||
from src.core.cot_logger import MarkerLogger
|
||||
from src.core.logger import belief_scope
|
||||
|
||||
log = MarkerLogger("GitUrl")
|
||||
from src.core.logger import logger, belief_scope
|
||||
from src.models.git import GitRepository, GitServerConfig
|
||||
|
||||
# #region GitServiceUrlMixin [C:3] [TYPE Class]
|
||||
# @BRIEF URL helper methods for GitService — extract host, strip credentials, replace host, align origin, parse remote identity, derive server URL, normalize server URL.
|
||||
class GitServiceUrlMixin:
|
||||
# #region _extract_http_host [TYPE Function]
|
||||
# @BRIEF Extract normalized host[:port] from HTTP(S) URL.
|
||||
# @PRE url_value may be empty.
|
||||
# @POST Returns lowercase host token or None.
|
||||
# @RETURN Optional[str]
|
||||
# [DEF:_extract_http_host:Function]
|
||||
# @PURPOSE: Extract normalized host[:port] from HTTP(S) URL.
|
||||
# @PRE: url_value may be empty.
|
||||
# @POST: Returns lowercase host token or None.
|
||||
# @RETURN: Optional[str]
|
||||
def _extract_http_host(self, url_value: Optional[str]) -> Optional[str]:
|
||||
normalized = str(url_value or "").strip()
|
||||
if not normalized:
|
||||
@@ -40,13 +37,13 @@ class GitServiceUrlMixin:
|
||||
if parsed.port:
|
||||
return f"{host.lower()}:{parsed.port}"
|
||||
return host.lower()
|
||||
# #endregion _extract_http_host
|
||||
# [/DEF:_extract_http_host:Function]
|
||||
|
||||
# #region _strip_url_credentials [TYPE Function]
|
||||
# @BRIEF Remove credentials from URL while preserving scheme/host/path.
|
||||
# @PRE url_value may contain credentials.
|
||||
# @POST Returns URL without username/password.
|
||||
# @RETURN str
|
||||
# [DEF:_strip_url_credentials:Function]
|
||||
# @PURPOSE: Remove credentials from URL while preserving scheme/host/path.
|
||||
# @PRE: url_value may contain credentials.
|
||||
# @POST: Returns URL without username/password.
|
||||
# @RETURN: str
|
||||
def _strip_url_credentials(self, url_value: str) -> str:
|
||||
normalized = str(url_value or "").strip()
|
||||
if not normalized:
|
||||
@@ -61,13 +58,13 @@ class GitServiceUrlMixin:
|
||||
if parsed.port:
|
||||
host = f"{host}:{parsed.port}"
|
||||
return parsed._replace(netloc=host).geturl()
|
||||
# #endregion _strip_url_credentials
|
||||
# [/DEF:_strip_url_credentials:Function]
|
||||
|
||||
# #region _replace_host_in_url [TYPE Function]
|
||||
# @BRIEF Replace source URL host with host from configured server URL.
|
||||
# @PRE source_url and config_url are HTTP(S) URLs.
|
||||
# @POST Returns source URL with updated host (credentials preserved) or None.
|
||||
# @RETURN Optional[str]
|
||||
# [DEF:_replace_host_in_url:Function]
|
||||
# @PURPOSE: Replace source URL host with host from configured server URL.
|
||||
# @PRE: source_url and config_url are HTTP(S) URLs.
|
||||
# @POST: Returns source URL with updated host (credentials preserved) or None.
|
||||
# @RETURN: Optional[str]
|
||||
def _replace_host_in_url(self, source_url: Optional[str], config_url: Optional[str]) -> Optional[str]:
|
||||
source = str(source_url or "").strip()
|
||||
config = str(config_url or "").strip()
|
||||
@@ -93,13 +90,13 @@ class GitServiceUrlMixin:
|
||||
auth_part = f"{auth_part}@"
|
||||
new_netloc = f"{auth_part}{target_host}"
|
||||
return source_parsed._replace(netloc=new_netloc).geturl()
|
||||
# #endregion _replace_host_in_url
|
||||
# [/DEF:_replace_host_in_url:Function]
|
||||
|
||||
# #region _align_origin_host_with_config [TYPE Function]
|
||||
# @BRIEF Auto-align local origin host to configured Git server host when they drift.
|
||||
# @PRE origin remote exists.
|
||||
# @POST origin URL host updated and DB binding normalized when mismatch detected.
|
||||
# @RETURN Optional[str]
|
||||
# [DEF:_align_origin_host_with_config:Function]
|
||||
# @PURPOSE: Auto-align local origin host to configured Git server host when they drift.
|
||||
# @PRE: origin remote exists.
|
||||
# @POST: origin URL host updated and DB binding normalized when mismatch detected.
|
||||
# @RETURN: Optional[str]
|
||||
def _align_origin_host_with_config(
|
||||
self,
|
||||
dashboard_id: int,
|
||||
@@ -118,11 +115,17 @@ class GitServiceUrlMixin:
|
||||
aligned_url = self._replace_host_in_url(source_origin_url, config_url)
|
||||
if not aligned_url:
|
||||
return None
|
||||
log.explore(f"Host mismatch for dashboard {dashboard_id}: config_host={config_host} origin_host={origin_host}, applying origin.set_url", error=f"Host mismatch for dashboard {dashboard_id}")
|
||||
logger.warning(
|
||||
"[_align_origin_host_with_config][Action] Host mismatch for dashboard %s: config_host=%s origin_host=%s, applying origin.set_url",
|
||||
dashboard_id, config_host, origin_host,
|
||||
)
|
||||
try:
|
||||
origin.set_url(aligned_url)
|
||||
except Exception as e:
|
||||
log.explore(f"Failed to set origin URL for dashboard {dashboard_id}: {e}", error=str(e))
|
||||
logger.warning(
|
||||
"[_align_origin_host_with_config][Coherence:Failed] Failed to set origin URL for dashboard %s: %s",
|
||||
dashboard_id, e,
|
||||
)
|
||||
return None
|
||||
try:
|
||||
session = SessionLocal()
|
||||
@@ -138,15 +141,18 @@ class GitServiceUrlMixin:
|
||||
finally:
|
||||
session.close()
|
||||
except Exception as e:
|
||||
log.explore(f"Failed to persist aligned remote_url for dashboard {dashboard_id}: {e}", error=str(e))
|
||||
logger.warning(
|
||||
"[_align_origin_host_with_config][Action] Failed to persist aligned remote_url for dashboard %s: %s",
|
||||
dashboard_id, e,
|
||||
)
|
||||
return aligned_url
|
||||
# #endregion _align_origin_host_with_config
|
||||
# [/DEF:_align_origin_host_with_config:Function]
|
||||
|
||||
# #region _parse_remote_repo_identity [TYPE Function]
|
||||
# @BRIEF Parse owner/repo from remote URL for Git server API operations.
|
||||
# @PRE remote_url is a valid git URL.
|
||||
# @POST Returns owner/repo tokens.
|
||||
# @RETURN Dict[str, str]
|
||||
# [DEF:_parse_remote_repo_identity:Function]
|
||||
# @PURPOSE: Parse owner/repo from remote URL for Git server API operations.
|
||||
# @PRE: remote_url is a valid git URL.
|
||||
# @POST: Returns owner/repo tokens.
|
||||
# @RETURN: Dict[str, str]
|
||||
def _parse_remote_repo_identity(self, remote_url: str) -> Dict[str, str]:
|
||||
normalized = str(remote_url or "").strip()
|
||||
if not normalized:
|
||||
@@ -166,13 +172,13 @@ class GitServiceUrlMixin:
|
||||
repo = parts[-1]
|
||||
namespace = "/".join(parts[:-1])
|
||||
return {"owner": owner, "repo": repo, "namespace": namespace, "full_name": f"{namespace}/{repo}"}
|
||||
# #endregion _parse_remote_repo_identity
|
||||
# [/DEF:_parse_remote_repo_identity:Function]
|
||||
|
||||
# #region _derive_server_url_from_remote [TYPE Function]
|
||||
# @BRIEF Build API base URL from remote repository URL without credentials.
|
||||
# @PRE remote_url may be any git URL.
|
||||
# @POST Returns normalized http(s) base URL or None when derivation is impossible.
|
||||
# @RETURN Optional[str]
|
||||
# [DEF:_derive_server_url_from_remote:Function]
|
||||
# @PURPOSE: Build API base URL from remote repository URL without credentials.
|
||||
# @PRE: remote_url may be any git URL.
|
||||
# @POST: Returns normalized http(s) base URL or None when derivation is impossible.
|
||||
# @RETURN: Optional[str]
|
||||
def _derive_server_url_from_remote(self, remote_url: str) -> Optional[str]:
|
||||
normalized = str(remote_url or "").strip()
|
||||
if not normalized or normalized.startswith("git@"):
|
||||
@@ -186,18 +192,18 @@ class GitServiceUrlMixin:
|
||||
if parsed.port:
|
||||
netloc = f"{netloc}:{parsed.port}"
|
||||
return f"{parsed.scheme}://{netloc}".rstrip("/")
|
||||
# #endregion _derive_server_url_from_remote
|
||||
# [/DEF:_derive_server_url_from_remote:Function]
|
||||
|
||||
# #region _normalize_git_server_url [TYPE Function]
|
||||
# @BRIEF Normalize Git server URL for provider API calls.
|
||||
# @PRE raw_url is non-empty.
|
||||
# @POST Returns URL without trailing slash.
|
||||
# @RETURN str
|
||||
# [DEF:_normalize_git_server_url:Function]
|
||||
# @PURPOSE: Normalize Git server URL for provider API calls.
|
||||
# @PRE: raw_url is non-empty.
|
||||
# @POST: Returns URL without trailing slash.
|
||||
# @RETURN: str
|
||||
def _normalize_git_server_url(self, raw_url: str) -> str:
|
||||
normalized = (raw_url or "").strip()
|
||||
if not normalized:
|
||||
raise HTTPException(status_code=400, detail="Git server URL is required")
|
||||
return normalized.rstrip("/")
|
||||
# #endregion _normalize_git_server_url
|
||||
# [/DEF:_normalize_git_server_url:Function]
|
||||
# #endregion GitServiceUrlMixin
|
||||
# #endregion GitServiceUrlMixin
|
||||
|
||||
Reference in New Issue
Block a user