Compare commits
2 Commits
47b3eb439d
...
fix/upstre
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a93bf84b83 | ||
|
|
2c123d8d0f |
15
CHANGELOG.md
15
CHANGELOG.md
@@ -6,21 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
|||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
### Added
|
|
||||||
- Added transparent PyPI proxy implementing PEP 503 Simple API (#108)
|
|
||||||
- `GET /pypi/simple/` - package index (proxied from upstream)
|
|
||||||
- `GET /pypi/simple/{package}/` - version list with rewritten download links
|
|
||||||
- `GET /pypi/simple/{package}/{filename}` - download with automatic caching
|
|
||||||
- Allows `pip install --index-url https://orchard.../pypi/simple/ <package>`
|
|
||||||
- Artifacts cached on first access through configured upstream sources
|
|
||||||
- Added `POST /api/v1/cache/resolve` endpoint to cache packages by coordinates instead of URL (#108)
|
|
||||||
|
|
||||||
### Changed
|
|
||||||
- Upstream sources table text is now centered under column headers (#108)
|
|
||||||
- ENV badge now appears inline with source name instead of separate column (#108)
|
|
||||||
- Test and Edit buttons now have more prominent button styling (#108)
|
|
||||||
- Reduced footer padding for cleaner layout (#108)
|
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Fixed purge_seed_data crash when deleting access permissions - was comparing UUID to VARCHAR column (#107)
|
- Fixed purge_seed_data crash when deleting access permissions - was comparing UUID to VARCHAR column (#107)
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ from slowapi.errors import RateLimitExceeded
|
|||||||
from .config import get_settings
|
from .config import get_settings
|
||||||
from .database import init_db, SessionLocal
|
from .database import init_db, SessionLocal
|
||||||
from .routes import router
|
from .routes import router
|
||||||
from .pypi_proxy import router as pypi_router
|
|
||||||
from .seed import seed_database
|
from .seed import seed_database
|
||||||
from .auth import create_default_admin
|
from .auth import create_default_admin
|
||||||
from .rate_limit import limiter
|
from .rate_limit import limiter
|
||||||
@@ -66,7 +65,6 @@ app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
|
|||||||
|
|
||||||
# Include API routes
|
# Include API routes
|
||||||
app.include_router(router)
|
app.include_router(router)
|
||||||
app.include_router(pypi_router)
|
|
||||||
|
|
||||||
# Serve static files (React build) if the directory exists
|
# Serve static files (React build) if the directory exists
|
||||||
static_dir = os.path.join(os.path.dirname(__file__), "..", "..", "frontend", "dist")
|
static_dir = os.path.join(os.path.dirname(__file__), "..", "..", "frontend", "dist")
|
||||||
|
|||||||
@@ -1,780 +0,0 @@
|
|||||||
"""
|
|
||||||
Transparent PyPI proxy implementing PEP 503 (Simple API).
|
|
||||||
|
|
||||||
Provides endpoints that allow pip to use Orchard as a PyPI index URL.
|
|
||||||
Artifacts are cached on first access through configured upstream sources.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import hashlib
|
|
||||||
import logging
|
|
||||||
import re
|
|
||||||
import tarfile
|
|
||||||
import zipfile
|
|
||||||
from io import BytesIO
|
|
||||||
from typing import Optional, List, Tuple
|
|
||||||
from urllib.parse import urljoin, urlparse, quote, unquote
|
|
||||||
|
|
||||||
import httpx
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, Request, Response
|
|
||||||
from fastapi.responses import StreamingResponse, HTMLResponse
|
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
|
|
||||||
from .database import get_db
|
|
||||||
from .models import UpstreamSource, CachedUrl, Artifact, Project, Package, Tag, PackageVersion, ArtifactDependency
|
|
||||||
from .storage import S3Storage, get_storage
|
|
||||||
from .config import get_env_upstream_sources
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
router = APIRouter(prefix="/pypi", tags=["pypi-proxy"])
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_requires_dist(requires_dist: str) -> Tuple[str, Optional[str]]:
|
|
||||||
"""Parse a Requires-Dist line into (package_name, version_constraint).
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
"requests (>=2.25.0)" -> ("requests", ">=2.25.0")
|
|
||||||
"typing-extensions; python_version < '3.8'" -> ("typing-extensions", None)
|
|
||||||
"numpy>=1.21.0" -> ("numpy", ">=1.21.0")
|
|
||||||
"certifi" -> ("certifi", None)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tuple of (normalized_package_name, version_constraint or None)
|
|
||||||
"""
|
|
||||||
# Remove any environment markers (after semicolon)
|
|
||||||
if ';' in requires_dist:
|
|
||||||
requires_dist = requires_dist.split(';')[0].strip()
|
|
||||||
|
|
||||||
# Match patterns like "package (>=1.0)" or "package>=1.0" or "package"
|
|
||||||
# Pattern breakdown: package name, optional whitespace, optional version in parens or directly
|
|
||||||
match = re.match(
|
|
||||||
r'^([a-zA-Z0-9][-a-zA-Z0-9._]*)\s*(?:\(([^)]+)\)|([<>=!~][^\s;]+))?',
|
|
||||||
requires_dist.strip()
|
|
||||||
)
|
|
||||||
|
|
||||||
if not match:
|
|
||||||
return None, None
|
|
||||||
|
|
||||||
package_name = match.group(1)
|
|
||||||
# Version can be in parentheses (group 2) or directly after name (group 3)
|
|
||||||
version_constraint = match.group(2) or match.group(3)
|
|
||||||
|
|
||||||
# Normalize package name (PEP 503)
|
|
||||||
normalized_name = re.sub(r'[-_.]+', '-', package_name).lower()
|
|
||||||
|
|
||||||
# Clean up version constraint
|
|
||||||
if version_constraint:
|
|
||||||
version_constraint = version_constraint.strip()
|
|
||||||
|
|
||||||
return normalized_name, version_constraint
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_requires_from_metadata(metadata_content: str) -> List[Tuple[str, Optional[str]]]:
|
|
||||||
"""Extract all Requires-Dist entries from METADATA/PKG-INFO content.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
metadata_content: The content of a METADATA or PKG-INFO file
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List of (package_name, version_constraint) tuples
|
|
||||||
"""
|
|
||||||
dependencies = []
|
|
||||||
|
|
||||||
for line in metadata_content.split('\n'):
|
|
||||||
if line.startswith('Requires-Dist:'):
|
|
||||||
# Extract the value after "Requires-Dist:"
|
|
||||||
value = line[len('Requires-Dist:'):].strip()
|
|
||||||
pkg_name, version = _parse_requires_dist(value)
|
|
||||||
if pkg_name:
|
|
||||||
dependencies.append((pkg_name, version))
|
|
||||||
|
|
||||||
return dependencies
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_metadata_from_wheel(content: bytes) -> Optional[str]:
|
|
||||||
"""Extract METADATA file content from a wheel (zip) file.
|
|
||||||
|
|
||||||
Wheel files have structure: {package}-{version}.dist-info/METADATA
|
|
||||||
|
|
||||||
Args:
|
|
||||||
content: The wheel file content as bytes
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
METADATA file content as string, or None if not found
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
with zipfile.ZipFile(BytesIO(content)) as zf:
|
|
||||||
# Find the .dist-info directory
|
|
||||||
for name in zf.namelist():
|
|
||||||
if name.endswith('.dist-info/METADATA'):
|
|
||||||
return zf.read(name).decode('utf-8', errors='replace')
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning(f"Failed to extract metadata from wheel: {e}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_metadata_from_sdist(content: bytes, filename: str) -> Optional[str]:
|
|
||||||
"""Extract PKG-INFO file content from a source distribution (.tar.gz).
|
|
||||||
|
|
||||||
Source distributions have structure: {package}-{version}/PKG-INFO
|
|
||||||
|
|
||||||
Args:
|
|
||||||
content: The tarball content as bytes
|
|
||||||
filename: The original filename (used to determine package name)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
PKG-INFO file content as string, or None if not found
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
with tarfile.open(fileobj=BytesIO(content), mode='r:gz') as tf:
|
|
||||||
# Find PKG-INFO in the root directory of the archive
|
|
||||||
for member in tf.getmembers():
|
|
||||||
if member.name.endswith('/PKG-INFO') and member.name.count('/') == 1:
|
|
||||||
f = tf.extractfile(member)
|
|
||||||
if f:
|
|
||||||
return f.read().decode('utf-8', errors='replace')
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning(f"Failed to extract metadata from sdist {filename}: {e}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_dependencies(content: bytes, filename: str) -> List[Tuple[str, Optional[str]]]:
|
|
||||||
"""Extract dependencies from a PyPI package file.
|
|
||||||
|
|
||||||
Supports wheel (.whl) and source distribution (.tar.gz) formats.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
content: The package file content as bytes
|
|
||||||
filename: The original filename
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List of (package_name, version_constraint) tuples
|
|
||||||
"""
|
|
||||||
metadata = None
|
|
||||||
|
|
||||||
if filename.endswith('.whl'):
|
|
||||||
metadata = _extract_metadata_from_wheel(content)
|
|
||||||
elif filename.endswith('.tar.gz'):
|
|
||||||
metadata = _extract_metadata_from_sdist(content, filename)
|
|
||||||
|
|
||||||
if metadata:
|
|
||||||
return _extract_requires_from_metadata(metadata)
|
|
||||||
|
|
||||||
return []
|
|
||||||
|
|
||||||
# Timeout configuration for proxy requests
|
|
||||||
PROXY_CONNECT_TIMEOUT = 30.0
|
|
||||||
PROXY_READ_TIMEOUT = 60.0
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_pypi_version(filename: str) -> Optional[str]:
|
|
||||||
"""Extract version from PyPI filename.
|
|
||||||
|
|
||||||
Handles formats like:
|
|
||||||
- cowsay-6.1-py3-none-any.whl
|
|
||||||
- cowsay-1.0.tar.gz
|
|
||||||
- some_package-1.2.3.post1-cp39-cp39-linux_x86_64.whl
|
|
||||||
"""
|
|
||||||
# Remove extension
|
|
||||||
if filename.endswith('.whl'):
|
|
||||||
# Wheel: name-version-pytag-abitag-platform.whl
|
|
||||||
parts = filename[:-4].split('-')
|
|
||||||
if len(parts) >= 2:
|
|
||||||
return parts[1]
|
|
||||||
elif filename.endswith('.tar.gz'):
|
|
||||||
# Source: name-version.tar.gz
|
|
||||||
base = filename[:-7]
|
|
||||||
# Find the last hyphen that precedes a version-like string
|
|
||||||
match = re.match(r'^(.+)-(\d+.*)$', base)
|
|
||||||
if match:
|
|
||||||
return match.group(2)
|
|
||||||
elif filename.endswith('.zip'):
|
|
||||||
# Egg/zip: name-version.zip
|
|
||||||
base = filename[:-4]
|
|
||||||
match = re.match(r'^(.+)-(\d+.*)$', base)
|
|
||||||
if match:
|
|
||||||
return match.group(2)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _get_pypi_upstream_sources(db: Session) -> list[UpstreamSource]:
|
|
||||||
"""Get all enabled upstream sources configured for PyPI."""
|
|
||||||
# Get database sources
|
|
||||||
db_sources = (
|
|
||||||
db.query(UpstreamSource)
|
|
||||||
.filter(
|
|
||||||
UpstreamSource.source_type == "pypi",
|
|
||||||
UpstreamSource.enabled == True,
|
|
||||||
)
|
|
||||||
.order_by(UpstreamSource.priority)
|
|
||||||
.all()
|
|
||||||
)
|
|
||||||
|
|
||||||
# Get env sources
|
|
||||||
env_sources = [
|
|
||||||
s for s in get_env_upstream_sources()
|
|
||||||
if s.source_type == "pypi" and s.enabled
|
|
||||||
]
|
|
||||||
|
|
||||||
# Combine and sort by priority
|
|
||||||
all_sources = list(db_sources) + list(env_sources)
|
|
||||||
return sorted(all_sources, key=lambda s: s.priority)
|
|
||||||
|
|
||||||
|
|
||||||
def _build_auth_headers(source) -> dict:
|
|
||||||
"""Build authentication headers for an upstream source."""
|
|
||||||
headers = {}
|
|
||||||
|
|
||||||
if hasattr(source, 'auth_type'):
|
|
||||||
if source.auth_type == "bearer":
|
|
||||||
password = source.get_password() if hasattr(source, 'get_password') else getattr(source, 'password', None)
|
|
||||||
if password:
|
|
||||||
headers["Authorization"] = f"Bearer {password}"
|
|
||||||
elif source.auth_type == "api_key":
|
|
||||||
custom_headers = source.get_headers() if hasattr(source, 'get_headers') else {}
|
|
||||||
if custom_headers:
|
|
||||||
headers.update(custom_headers)
|
|
||||||
|
|
||||||
return headers
|
|
||||||
|
|
||||||
|
|
||||||
def _get_basic_auth(source) -> Optional[tuple[str, str]]:
|
|
||||||
"""Get basic auth credentials if applicable."""
|
|
||||||
if hasattr(source, 'auth_type') and source.auth_type == "basic":
|
|
||||||
username = getattr(source, 'username', None)
|
|
||||||
if username:
|
|
||||||
password = source.get_password() if hasattr(source, 'get_password') else getattr(source, 'password', '')
|
|
||||||
return (username, password or '')
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _get_base_url(request: Request) -> str:
|
|
||||||
"""
|
|
||||||
Get the external base URL, respecting X-Forwarded-Proto header.
|
|
||||||
|
|
||||||
When behind a reverse proxy that terminates SSL, the request.base_url
|
|
||||||
will show http:// even though the external URL is https://. This function
|
|
||||||
checks the X-Forwarded-Proto header to determine the correct scheme.
|
|
||||||
"""
|
|
||||||
base_url = str(request.base_url).rstrip('/')
|
|
||||||
|
|
||||||
# Check for X-Forwarded-Proto header (set by reverse proxies)
|
|
||||||
forwarded_proto = request.headers.get('x-forwarded-proto')
|
|
||||||
if forwarded_proto:
|
|
||||||
# Replace the scheme with the forwarded protocol
|
|
||||||
parsed = urlparse(base_url)
|
|
||||||
base_url = f"{forwarded_proto}://{parsed.netloc}{parsed.path}"
|
|
||||||
|
|
||||||
return base_url
|
|
||||||
|
|
||||||
|
|
||||||
def _rewrite_package_links(html: str, base_url: str, package_name: str, upstream_base_url: str) -> str:
|
|
||||||
"""
|
|
||||||
Rewrite download links in a PyPI simple page to go through our proxy.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
html: The HTML content from upstream
|
|
||||||
base_url: Our server's base URL
|
|
||||||
package_name: The package name for the URL path
|
|
||||||
upstream_base_url: The upstream URL used to fetch this page (for resolving relative URLs)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
HTML with rewritten download links
|
|
||||||
"""
|
|
||||||
# Pattern to match href attributes in anchor tags
|
|
||||||
# PyPI simple pages have links like:
|
|
||||||
# <a href="https://files.pythonhosted.org/packages/.../file.tar.gz#sha256=...">file.tar.gz</a>
|
|
||||||
# Or relative URLs from Artifactory like:
|
|
||||||
# <a href="../../packages/packages/62/35/.../requests-0.10.0.tar.gz#sha256=...">
|
|
||||||
|
|
||||||
def replace_href(match):
|
|
||||||
original_url = match.group(1)
|
|
||||||
|
|
||||||
# Resolve relative URLs to absolute using the upstream base URL
|
|
||||||
if not original_url.startswith(('http://', 'https://')):
|
|
||||||
# Split off fragment before resolving
|
|
||||||
url_without_fragment = original_url.split('#')[0]
|
|
||||||
fragment_part = original_url[len(url_without_fragment):]
|
|
||||||
absolute_url = urljoin(upstream_base_url, url_without_fragment) + fragment_part
|
|
||||||
else:
|
|
||||||
absolute_url = original_url
|
|
||||||
|
|
||||||
# Extract the filename from the URL
|
|
||||||
parsed = urlparse(absolute_url)
|
|
||||||
path_parts = parsed.path.split('/')
|
|
||||||
filename = path_parts[-1] if path_parts else ''
|
|
||||||
|
|
||||||
# Keep the hash fragment if present
|
|
||||||
fragment = f"#{parsed.fragment}" if parsed.fragment else ""
|
|
||||||
|
|
||||||
# Encode the absolute URL (without fragment) for safe transmission
|
|
||||||
encoded_url = quote(absolute_url.split('#')[0], safe='')
|
|
||||||
|
|
||||||
# Build new URL pointing to our proxy
|
|
||||||
new_url = f"{base_url}/pypi/simple/{package_name}/{filename}?upstream={encoded_url}{fragment}"
|
|
||||||
|
|
||||||
return f'href="{new_url}"'
|
|
||||||
|
|
||||||
# Match href="..." patterns
|
|
||||||
rewritten = re.sub(r'href="([^"]+)"', replace_href, html)
|
|
||||||
|
|
||||||
return rewritten
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/simple/")
|
|
||||||
async def pypi_simple_index(
|
|
||||||
request: Request,
|
|
||||||
db: Session = Depends(get_db),
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
PyPI Simple API index - lists all packages.
|
|
||||||
|
|
||||||
Proxies to the first available upstream PyPI source.
|
|
||||||
"""
|
|
||||||
sources = _get_pypi_upstream_sources(db)
|
|
||||||
|
|
||||||
if not sources:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=503,
|
|
||||||
detail="No PyPI upstream sources configured"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Try each source in priority order
|
|
||||||
last_error = None
|
|
||||||
for source in sources:
|
|
||||||
try:
|
|
||||||
headers = {"User-Agent": "Orchard-PyPI-Proxy/1.0"}
|
|
||||||
headers.update(_build_auth_headers(source))
|
|
||||||
auth = _get_basic_auth(source)
|
|
||||||
|
|
||||||
# Use URL as-is - users should provide full path including /simple
|
|
||||||
simple_url = source.url.rstrip('/') + '/'
|
|
||||||
|
|
||||||
timeout = httpx.Timeout(PROXY_READ_TIMEOUT, connect=PROXY_CONNECT_TIMEOUT)
|
|
||||||
|
|
||||||
with httpx.Client(timeout=timeout, follow_redirects=False) as client:
|
|
||||||
response = client.get(
|
|
||||||
simple_url,
|
|
||||||
headers=headers,
|
|
||||||
auth=auth,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Handle redirects manually to avoid loops
|
|
||||||
if response.status_code in (301, 302, 303, 307, 308):
|
|
||||||
redirect_url = response.headers.get('location')
|
|
||||||
if redirect_url:
|
|
||||||
# Follow the redirect once
|
|
||||||
response = client.get(
|
|
||||||
redirect_url,
|
|
||||||
headers=headers,
|
|
||||||
auth=auth,
|
|
||||||
follow_redirects=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
if response.status_code == 200:
|
|
||||||
# Return the index as-is (links are to package pages, not files)
|
|
||||||
# We could rewrite these too, but for now just proxy
|
|
||||||
content = response.text
|
|
||||||
|
|
||||||
# Rewrite package links to go through our proxy
|
|
||||||
base_url = _get_base_url(request)
|
|
||||||
content = re.sub(
|
|
||||||
r'href="([^"]+)/"',
|
|
||||||
lambda m: f'href="{base_url}/pypi/simple/{m.group(1)}/"',
|
|
||||||
content
|
|
||||||
)
|
|
||||||
|
|
||||||
return HTMLResponse(content=content)
|
|
||||||
|
|
||||||
last_error = f"HTTP {response.status_code}"
|
|
||||||
|
|
||||||
except httpx.ConnectError as e:
|
|
||||||
last_error = f"Connection failed: {e}"
|
|
||||||
logger.warning(f"PyPI proxy: failed to connect to {source.url}: {e}")
|
|
||||||
except httpx.TimeoutException as e:
|
|
||||||
last_error = f"Timeout: {e}"
|
|
||||||
logger.warning(f"PyPI proxy: timeout connecting to {source.url}: {e}")
|
|
||||||
except Exception as e:
|
|
||||||
last_error = str(e)
|
|
||||||
logger.warning(f"PyPI proxy: error fetching from {source.url}: {e}")
|
|
||||||
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=502,
|
|
||||||
detail=f"Failed to fetch package index from upstream: {last_error}"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/simple/{package_name}/")
|
|
||||||
async def pypi_package_versions(
|
|
||||||
request: Request,
|
|
||||||
package_name: str,
|
|
||||||
db: Session = Depends(get_db),
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
PyPI Simple API package page - lists all versions/files for a package.
|
|
||||||
|
|
||||||
Proxies to upstream and rewrites download links to go through our cache.
|
|
||||||
"""
|
|
||||||
sources = _get_pypi_upstream_sources(db)
|
|
||||||
|
|
||||||
if not sources:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=503,
|
|
||||||
detail="No PyPI upstream sources configured"
|
|
||||||
)
|
|
||||||
|
|
||||||
base_url = _get_base_url(request)
|
|
||||||
|
|
||||||
# Normalize package name (PEP 503)
|
|
||||||
normalized_name = re.sub(r'[-_.]+', '-', package_name).lower()
|
|
||||||
|
|
||||||
# Try each source in priority order
|
|
||||||
last_error = None
|
|
||||||
for source in sources:
|
|
||||||
try:
|
|
||||||
headers = {"User-Agent": "Orchard-PyPI-Proxy/1.0"}
|
|
||||||
headers.update(_build_auth_headers(source))
|
|
||||||
auth = _get_basic_auth(source)
|
|
||||||
|
|
||||||
# Use URL as-is - users should provide full path including /simple
|
|
||||||
package_url = source.url.rstrip('/') + f'/{normalized_name}/'
|
|
||||||
final_url = package_url # Track final URL after redirects
|
|
||||||
|
|
||||||
timeout = httpx.Timeout(PROXY_READ_TIMEOUT, connect=PROXY_CONNECT_TIMEOUT)
|
|
||||||
|
|
||||||
with httpx.Client(timeout=timeout, follow_redirects=False) as client:
|
|
||||||
response = client.get(
|
|
||||||
package_url,
|
|
||||||
headers=headers,
|
|
||||||
auth=auth,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Handle redirects manually
|
|
||||||
redirect_count = 0
|
|
||||||
while response.status_code in (301, 302, 303, 307, 308) and redirect_count < 5:
|
|
||||||
redirect_url = response.headers.get('location')
|
|
||||||
if not redirect_url:
|
|
||||||
break
|
|
||||||
|
|
||||||
# Make redirect URL absolute if needed
|
|
||||||
if not redirect_url.startswith('http'):
|
|
||||||
redirect_url = urljoin(final_url, redirect_url)
|
|
||||||
|
|
||||||
final_url = redirect_url # Update final URL
|
|
||||||
|
|
||||||
response = client.get(
|
|
||||||
redirect_url,
|
|
||||||
headers=headers,
|
|
||||||
auth=auth,
|
|
||||||
follow_redirects=False,
|
|
||||||
)
|
|
||||||
redirect_count += 1
|
|
||||||
|
|
||||||
if response.status_code == 200:
|
|
||||||
content = response.text
|
|
||||||
|
|
||||||
# Rewrite download links to go through our proxy
|
|
||||||
# Pass final_url so relative URLs can be resolved correctly
|
|
||||||
content = _rewrite_package_links(content, base_url, normalized_name, final_url)
|
|
||||||
|
|
||||||
return HTMLResponse(content=content)
|
|
||||||
|
|
||||||
if response.status_code == 404:
|
|
||||||
# Package not found in this source, try next
|
|
||||||
last_error = f"Package not found in {source.name}"
|
|
||||||
continue
|
|
||||||
|
|
||||||
last_error = f"HTTP {response.status_code}"
|
|
||||||
|
|
||||||
except httpx.ConnectError as e:
|
|
||||||
last_error = f"Connection failed: {e}"
|
|
||||||
logger.warning(f"PyPI proxy: failed to connect to {source.url}: {e}")
|
|
||||||
except httpx.TimeoutException as e:
|
|
||||||
last_error = f"Timeout: {e}"
|
|
||||||
logger.warning(f"PyPI proxy: timeout connecting to {source.url}: {e}")
|
|
||||||
except Exception as e:
|
|
||||||
last_error = str(e)
|
|
||||||
logger.warning(f"PyPI proxy: error fetching {package_name} from {source.url}: {e}")
|
|
||||||
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=404,
|
|
||||||
detail=f"Package '{package_name}' not found: {last_error}"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/simple/{package_name}/{filename}")
|
|
||||||
async def pypi_download_file(
|
|
||||||
request: Request,
|
|
||||||
package_name: str,
|
|
||||||
filename: str,
|
|
||||||
upstream: Optional[str] = None,
|
|
||||||
db: Session = Depends(get_db),
|
|
||||||
storage: S3Storage = Depends(get_storage),
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
Download a package file, caching it in Orchard.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
package_name: The package name
|
|
||||||
filename: The filename to download
|
|
||||||
upstream: URL-encoded upstream URL to fetch from
|
|
||||||
"""
|
|
||||||
if not upstream:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=400,
|
|
||||||
detail="Missing 'upstream' query parameter with source URL"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Decode the upstream URL
|
|
||||||
upstream_url = unquote(upstream)
|
|
||||||
|
|
||||||
# Check if we already have this URL cached
|
|
||||||
url_hash = hashlib.sha256(upstream_url.encode()).hexdigest()
|
|
||||||
cached_url = db.query(CachedUrl).filter(CachedUrl.url_hash == url_hash).first()
|
|
||||||
|
|
||||||
if cached_url:
|
|
||||||
# Serve from cache
|
|
||||||
artifact = db.query(Artifact).filter(Artifact.id == cached_url.artifact_id).first()
|
|
||||||
if artifact:
|
|
||||||
logger.info(f"PyPI proxy: serving cached {filename} (artifact {artifact.id[:12]})")
|
|
||||||
|
|
||||||
# Stream from S3
|
|
||||||
try:
|
|
||||||
stream, content_length, _ = storage.get_stream(artifact.s3_key)
|
|
||||||
|
|
||||||
def stream_content():
|
|
||||||
"""Generator that yields chunks from the S3 stream."""
|
|
||||||
try:
|
|
||||||
for chunk in stream.iter_chunks():
|
|
||||||
yield chunk
|
|
||||||
finally:
|
|
||||||
stream.close()
|
|
||||||
|
|
||||||
return StreamingResponse(
|
|
||||||
stream_content(),
|
|
||||||
media_type=artifact.content_type or "application/octet-stream",
|
|
||||||
headers={
|
|
||||||
"Content-Disposition": f'attachment; filename="{filename}"',
|
|
||||||
"Content-Length": str(content_length),
|
|
||||||
"X-Checksum-SHA256": artifact.id,
|
|
||||||
"X-Cache": "HIT",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"PyPI proxy: error streaming cached artifact: {e}")
|
|
||||||
# Fall through to fetch from upstream
|
|
||||||
|
|
||||||
# Not cached - fetch from upstream
|
|
||||||
sources = _get_pypi_upstream_sources(db)
|
|
||||||
|
|
||||||
# Use the first available source for authentication headers
|
|
||||||
# Note: The upstream URL may point to files.pythonhosted.org or other CDNs,
|
|
||||||
# not the configured source URL directly, so we can't strictly validate the host
|
|
||||||
matched_source = sources[0] if sources else None
|
|
||||||
|
|
||||||
try:
|
|
||||||
headers = {"User-Agent": "Orchard-PyPI-Proxy/1.0"}
|
|
||||||
if matched_source:
|
|
||||||
headers.update(_build_auth_headers(matched_source))
|
|
||||||
auth = _get_basic_auth(matched_source) if matched_source else None
|
|
||||||
|
|
||||||
timeout = httpx.Timeout(300.0, connect=PROXY_CONNECT_TIMEOUT) # 5 minutes for large files
|
|
||||||
|
|
||||||
# Fetch the file
|
|
||||||
logger.info(f"PyPI proxy: fetching {filename} from {upstream_url}")
|
|
||||||
|
|
||||||
with httpx.Client(timeout=timeout, follow_redirects=False) as client:
|
|
||||||
response = client.get(
|
|
||||||
upstream_url,
|
|
||||||
headers=headers,
|
|
||||||
auth=auth,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Handle redirects manually
|
|
||||||
redirect_count = 0
|
|
||||||
while response.status_code in (301, 302, 303, 307, 308) and redirect_count < 5:
|
|
||||||
redirect_url = response.headers.get('location')
|
|
||||||
if not redirect_url:
|
|
||||||
break
|
|
||||||
|
|
||||||
if not redirect_url.startswith('http'):
|
|
||||||
redirect_url = urljoin(upstream_url, redirect_url)
|
|
||||||
|
|
||||||
logger.info(f"PyPI proxy: following redirect to {redirect_url}")
|
|
||||||
|
|
||||||
# Don't send auth to different hosts
|
|
||||||
redirect_headers = {"User-Agent": "Orchard-PyPI-Proxy/1.0"}
|
|
||||||
redirect_auth = None
|
|
||||||
if urlparse(redirect_url).netloc == urlparse(upstream_url).netloc:
|
|
||||||
redirect_headers.update(headers)
|
|
||||||
redirect_auth = auth
|
|
||||||
|
|
||||||
response = client.get(
|
|
||||||
redirect_url,
|
|
||||||
headers=redirect_headers,
|
|
||||||
auth=redirect_auth,
|
|
||||||
follow_redirects=False,
|
|
||||||
)
|
|
||||||
redirect_count += 1
|
|
||||||
|
|
||||||
if response.status_code != 200:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=response.status_code,
|
|
||||||
detail=f"Upstream returned {response.status_code}"
|
|
||||||
)
|
|
||||||
|
|
||||||
content = response.content
|
|
||||||
content_type = response.headers.get('content-type', 'application/octet-stream')
|
|
||||||
|
|
||||||
# Store in S3 (computes hash and deduplicates automatically)
|
|
||||||
from io import BytesIO
|
|
||||||
result = storage.store(BytesIO(content))
|
|
||||||
sha256 = result.sha256
|
|
||||||
size = result.size
|
|
||||||
|
|
||||||
logger.info(f"PyPI proxy: downloaded {filename}, {size} bytes, sha256={sha256[:12]}")
|
|
||||||
|
|
||||||
# Check if artifact already exists
|
|
||||||
existing = db.query(Artifact).filter(Artifact.id == sha256).first()
|
|
||||||
if existing:
|
|
||||||
# Increment ref count
|
|
||||||
existing.ref_count += 1
|
|
||||||
db.flush()
|
|
||||||
else:
|
|
||||||
# Create artifact record
|
|
||||||
new_artifact = Artifact(
|
|
||||||
id=sha256,
|
|
||||||
original_name=filename,
|
|
||||||
content_type=content_type,
|
|
||||||
size=size,
|
|
||||||
ref_count=1,
|
|
||||||
created_by="pypi-proxy",
|
|
||||||
s3_key=result.s3_key,
|
|
||||||
checksum_md5=result.md5,
|
|
||||||
checksum_sha1=result.sha1,
|
|
||||||
s3_etag=result.s3_etag,
|
|
||||||
)
|
|
||||||
db.add(new_artifact)
|
|
||||||
db.flush()
|
|
||||||
|
|
||||||
# Create/get system project and package
|
|
||||||
system_project = db.query(Project).filter(Project.name == "_pypi").first()
|
|
||||||
if not system_project:
|
|
||||||
system_project = Project(
|
|
||||||
name="_pypi",
|
|
||||||
description="System project for cached PyPI packages",
|
|
||||||
is_public=True,
|
|
||||||
is_system=True,
|
|
||||||
created_by="pypi-proxy",
|
|
||||||
)
|
|
||||||
db.add(system_project)
|
|
||||||
db.flush()
|
|
||||||
elif not system_project.is_system:
|
|
||||||
# Ensure existing project is marked as system
|
|
||||||
system_project.is_system = True
|
|
||||||
db.flush()
|
|
||||||
|
|
||||||
# Normalize package name
|
|
||||||
normalized_name = re.sub(r'[-_.]+', '-', package_name).lower()
|
|
||||||
|
|
||||||
package = db.query(Package).filter(
|
|
||||||
Package.project_id == system_project.id,
|
|
||||||
Package.name == normalized_name,
|
|
||||||
).first()
|
|
||||||
if not package:
|
|
||||||
package = Package(
|
|
||||||
project_id=system_project.id,
|
|
||||||
name=normalized_name,
|
|
||||||
description=f"PyPI package: {normalized_name}",
|
|
||||||
format="pypi",
|
|
||||||
)
|
|
||||||
db.add(package)
|
|
||||||
db.flush()
|
|
||||||
|
|
||||||
# Create tag with filename
|
|
||||||
existing_tag = db.query(Tag).filter(
|
|
||||||
Tag.package_id == package.id,
|
|
||||||
Tag.name == filename,
|
|
||||||
).first()
|
|
||||||
if not existing_tag:
|
|
||||||
tag = Tag(
|
|
||||||
package_id=package.id,
|
|
||||||
name=filename,
|
|
||||||
artifact_id=sha256,
|
|
||||||
created_by="pypi-proxy",
|
|
||||||
)
|
|
||||||
db.add(tag)
|
|
||||||
|
|
||||||
# Extract and create version
|
|
||||||
# Only create version for actual package files, not .metadata files
|
|
||||||
version = _extract_pypi_version(filename)
|
|
||||||
if version and not filename.endswith('.metadata'):
|
|
||||||
# Check by version string (the unique constraint is on package_id + version)
|
|
||||||
existing_version = db.query(PackageVersion).filter(
|
|
||||||
PackageVersion.package_id == package.id,
|
|
||||||
PackageVersion.version == version,
|
|
||||||
).first()
|
|
||||||
if not existing_version:
|
|
||||||
pkg_version = PackageVersion(
|
|
||||||
package_id=package.id,
|
|
||||||
artifact_id=sha256,
|
|
||||||
version=version,
|
|
||||||
version_source="filename",
|
|
||||||
created_by="pypi-proxy",
|
|
||||||
)
|
|
||||||
db.add(pkg_version)
|
|
||||||
|
|
||||||
# Cache the URL mapping
|
|
||||||
existing_cached = db.query(CachedUrl).filter(CachedUrl.url_hash == url_hash).first()
|
|
||||||
if not existing_cached:
|
|
||||||
cached_url_record = CachedUrl(
|
|
||||||
url_hash=url_hash,
|
|
||||||
url=upstream_url,
|
|
||||||
artifact_id=sha256,
|
|
||||||
)
|
|
||||||
db.add(cached_url_record)
|
|
||||||
|
|
||||||
# Extract and store dependencies
|
|
||||||
dependencies = _extract_dependencies(content, filename)
|
|
||||||
if dependencies:
|
|
||||||
logger.info(f"PyPI proxy: extracted {len(dependencies)} dependencies from {filename}")
|
|
||||||
for dep_name, dep_version in dependencies:
|
|
||||||
# Check if this dependency already exists for this artifact
|
|
||||||
existing_dep = db.query(ArtifactDependency).filter(
|
|
||||||
ArtifactDependency.artifact_id == sha256,
|
|
||||||
ArtifactDependency.dependency_project == "_pypi",
|
|
||||||
ArtifactDependency.dependency_package == dep_name,
|
|
||||||
).first()
|
|
||||||
|
|
||||||
if not existing_dep:
|
|
||||||
dep = ArtifactDependency(
|
|
||||||
artifact_id=sha256,
|
|
||||||
dependency_project="_pypi",
|
|
||||||
dependency_package=dep_name,
|
|
||||||
version_constraint=dep_version if dep_version else "*",
|
|
||||||
)
|
|
||||||
db.add(dep)
|
|
||||||
|
|
||||||
db.commit()
|
|
||||||
|
|
||||||
# Return the file
|
|
||||||
return Response(
|
|
||||||
content=content,
|
|
||||||
media_type=content_type,
|
|
||||||
headers={
|
|
||||||
"Content-Disposition": f'attachment; filename="{filename}"',
|
|
||||||
"Content-Length": str(size),
|
|
||||||
"X-Checksum-SHA256": sha256,
|
|
||||||
"X-Cache": "MISS",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
except httpx.ConnectError as e:
|
|
||||||
raise HTTPException(status_code=502, detail=f"Connection failed: {e}")
|
|
||||||
except httpx.TimeoutException as e:
|
|
||||||
raise HTTPException(status_code=504, detail=f"Timeout: {e}")
|
|
||||||
except HTTPException:
|
|
||||||
raise
|
|
||||||
except Exception as e:
|
|
||||||
logger.exception(f"PyPI proxy: error downloading {filename}")
|
|
||||||
raise HTTPException(status_code=500, detail=str(e))
|
|
||||||
@@ -1680,7 +1680,6 @@ def create_project(
|
|||||||
name=db_project.name,
|
name=db_project.name,
|
||||||
description=db_project.description,
|
description=db_project.description,
|
||||||
is_public=db_project.is_public,
|
is_public=db_project.is_public,
|
||||||
is_system=db_project.is_system,
|
|
||||||
created_at=db_project.created_at,
|
created_at=db_project.created_at,
|
||||||
updated_at=db_project.updated_at,
|
updated_at=db_project.updated_at,
|
||||||
created_by=db_project.created_by,
|
created_by=db_project.created_by,
|
||||||
@@ -1705,7 +1704,6 @@ def get_project(
|
|||||||
name=project.name,
|
name=project.name,
|
||||||
description=project.description,
|
description=project.description,
|
||||||
is_public=project.is_public,
|
is_public=project.is_public,
|
||||||
is_system=project.is_system,
|
|
||||||
created_at=project.created_at,
|
created_at=project.created_at,
|
||||||
updated_at=project.updated_at,
|
updated_at=project.updated_at,
|
||||||
created_by=project.created_by,
|
created_by=project.created_by,
|
||||||
@@ -2706,7 +2704,6 @@ def list_team_projects(
|
|||||||
name=p.name,
|
name=p.name,
|
||||||
description=p.description,
|
description=p.description,
|
||||||
is_public=p.is_public,
|
is_public=p.is_public,
|
||||||
is_system=p.is_system,
|
|
||||||
created_at=p.created_at,
|
created_at=p.created_at,
|
||||||
updated_at=p.updated_at,
|
updated_at=p.updated_at,
|
||||||
created_by=p.created_by,
|
created_by=p.created_by,
|
||||||
@@ -2830,15 +2827,14 @@ def list_packages(
|
|||||||
db.query(func.count(Tag.id)).filter(Tag.package_id == pkg.id).scalar() or 0
|
db.query(func.count(Tag.id)).filter(Tag.package_id == pkg.id).scalar() or 0
|
||||||
)
|
)
|
||||||
|
|
||||||
# Get unique artifact count and total size via tags
|
# Get unique artifact count and total size via uploads
|
||||||
# (PyPI proxy creates tags without uploads, so query from tags)
|
|
||||||
artifact_stats = (
|
artifact_stats = (
|
||||||
db.query(
|
db.query(
|
||||||
func.count(func.distinct(Tag.artifact_id)),
|
func.count(func.distinct(Upload.artifact_id)),
|
||||||
func.coalesce(func.sum(Artifact.size), 0),
|
func.coalesce(func.sum(Artifact.size), 0),
|
||||||
)
|
)
|
||||||
.join(Artifact, Tag.artifact_id == Artifact.id)
|
.join(Artifact, Upload.artifact_id == Artifact.id)
|
||||||
.filter(Tag.package_id == pkg.id)
|
.filter(Upload.package_id == pkg.id)
|
||||||
.first()
|
.first()
|
||||||
)
|
)
|
||||||
artifact_count = artifact_stats[0] if artifact_stats else 0
|
artifact_count = artifact_stats[0] if artifact_stats else 0
|
||||||
@@ -2934,15 +2930,14 @@ def get_package(
|
|||||||
db.query(func.count(Tag.id)).filter(Tag.package_id == pkg.id).scalar() or 0
|
db.query(func.count(Tag.id)).filter(Tag.package_id == pkg.id).scalar() or 0
|
||||||
)
|
)
|
||||||
|
|
||||||
# Get unique artifact count and total size via tags
|
# Get unique artifact count and total size via uploads
|
||||||
# (PyPI proxy creates tags without uploads, so query from tags)
|
|
||||||
artifact_stats = (
|
artifact_stats = (
|
||||||
db.query(
|
db.query(
|
||||||
func.count(func.distinct(Tag.artifact_id)),
|
func.count(func.distinct(Upload.artifact_id)),
|
||||||
func.coalesce(func.sum(Artifact.size), 0),
|
func.coalesce(func.sum(Artifact.size), 0),
|
||||||
)
|
)
|
||||||
.join(Artifact, Tag.artifact_id == Artifact.id)
|
.join(Artifact, Upload.artifact_id == Artifact.id)
|
||||||
.filter(Tag.package_id == pkg.id)
|
.filter(Upload.package_id == pkg.id)
|
||||||
.first()
|
.first()
|
||||||
)
|
)
|
||||||
artifact_count = artifact_stats[0] if artifact_stats else 0
|
artifact_count = artifact_stats[0] if artifact_stats else 0
|
||||||
@@ -6285,14 +6280,14 @@ def get_package_stats(
|
|||||||
db.query(func.count(Tag.id)).filter(Tag.package_id == package.id).scalar() or 0
|
db.query(func.count(Tag.id)).filter(Tag.package_id == package.id).scalar() or 0
|
||||||
)
|
)
|
||||||
|
|
||||||
# Artifact stats via tags (tags exist for both user uploads and PyPI proxy)
|
# Artifact stats via uploads
|
||||||
artifact_stats = (
|
artifact_stats = (
|
||||||
db.query(
|
db.query(
|
||||||
func.count(func.distinct(Tag.artifact_id)),
|
func.count(func.distinct(Upload.artifact_id)),
|
||||||
func.coalesce(func.sum(Artifact.size), 0),
|
func.coalesce(func.sum(Artifact.size), 0),
|
||||||
)
|
)
|
||||||
.join(Artifact, Tag.artifact_id == Artifact.id)
|
.join(Artifact, Upload.artifact_id == Artifact.id)
|
||||||
.filter(Tag.package_id == package.id)
|
.filter(Upload.package_id == package.id)
|
||||||
.first()
|
.first()
|
||||||
)
|
)
|
||||||
artifact_count = artifact_stats[0] if artifact_stats else 0
|
artifact_count = artifact_stats[0] if artifact_stats else 0
|
||||||
@@ -8310,200 +8305,6 @@ def _create_user_cache_reference(
|
|||||||
return f"{user_project_name}/{user_package_name}"
|
return f"{user_project_name}/{user_package_name}"
|
||||||
|
|
||||||
|
|
||||||
# --- Cache Resolve Endpoint ---
|
|
||||||
|
|
||||||
from .schemas import CacheResolveRequest
|
|
||||||
|
|
||||||
|
|
||||||
@router.post(
|
|
||||||
"/api/v1/cache/resolve",
|
|
||||||
response_model=CacheResponse,
|
|
||||||
tags=["cache"],
|
|
||||||
summary="Cache an artifact by package coordinates",
|
|
||||||
)
|
|
||||||
def cache_resolve(
|
|
||||||
request: Request,
|
|
||||||
resolve_request: CacheResolveRequest,
|
|
||||||
db: Session = Depends(get_db),
|
|
||||||
storage: S3Storage = Depends(get_storage),
|
|
||||||
current_user: User = Depends(get_current_user),
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
Cache an artifact by package coordinates (no URL required).
|
|
||||||
|
|
||||||
The server finds the appropriate download URL based on source_type
|
|
||||||
and configured upstream sources. Currently supports PyPI packages.
|
|
||||||
|
|
||||||
**Request Body:**
|
|
||||||
- `source_type` (required): Type of source (pypi, npm, maven, etc.)
|
|
||||||
- `package` (required): Package name
|
|
||||||
- `version` (required): Package version
|
|
||||||
- `user_project` (optional): Also create reference in this user project
|
|
||||||
- `user_package` (optional): Package name in user project
|
|
||||||
- `user_tag` (optional): Tag name in user project
|
|
||||||
|
|
||||||
**Example (curl):**
|
|
||||||
```bash
|
|
||||||
curl -X POST "http://localhost:8080/api/v1/cache/resolve" \\
|
|
||||||
-H "Authorization: Bearer <api-key>" \\
|
|
||||||
-H "Content-Type: application/json" \\
|
|
||||||
-d '{
|
|
||||||
"source_type": "pypi",
|
|
||||||
"package": "requests",
|
|
||||||
"version": "2.31.0"
|
|
||||||
}'
|
|
||||||
```
|
|
||||||
"""
|
|
||||||
import re
|
|
||||||
import httpx
|
|
||||||
from urllib.parse import quote, unquote
|
|
||||||
|
|
||||||
if resolve_request.source_type != "pypi":
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=501,
|
|
||||||
detail=f"Cache resolve for '{resolve_request.source_type}' not yet implemented. Currently only 'pypi' is supported."
|
|
||||||
)
|
|
||||||
|
|
||||||
# Get PyPI upstream sources
|
|
||||||
sources = (
|
|
||||||
db.query(UpstreamSource)
|
|
||||||
.filter(
|
|
||||||
UpstreamSource.source_type == "pypi",
|
|
||||||
UpstreamSource.enabled == True,
|
|
||||||
)
|
|
||||||
.order_by(UpstreamSource.priority)
|
|
||||||
.all()
|
|
||||||
)
|
|
||||||
|
|
||||||
# Also get env sources
|
|
||||||
env_sources = [
|
|
||||||
s for s in get_env_upstream_sources()
|
|
||||||
if s.source_type == "pypi" and s.enabled
|
|
||||||
]
|
|
||||||
all_sources = list(sources) + list(env_sources)
|
|
||||||
all_sources = sorted(all_sources, key=lambda s: s.priority)
|
|
||||||
|
|
||||||
if not all_sources:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=503,
|
|
||||||
detail="No PyPI upstream sources configured"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Normalize package name (PEP 503)
|
|
||||||
normalized_package = re.sub(r'[-_.]+', '-', resolve_request.package).lower()
|
|
||||||
|
|
||||||
# Query the Simple API to find the download URL
|
|
||||||
download_url = None
|
|
||||||
matched_filename = None
|
|
||||||
last_error = None
|
|
||||||
|
|
||||||
for source in all_sources:
|
|
||||||
try:
|
|
||||||
headers = {"User-Agent": "Orchard-CacheResolver/1.0"}
|
|
||||||
|
|
||||||
# Build auth if needed
|
|
||||||
if hasattr(source, 'auth_type'):
|
|
||||||
if source.auth_type == "bearer":
|
|
||||||
password = source.get_password() if hasattr(source, 'get_password') else getattr(source, 'password', None)
|
|
||||||
if password:
|
|
||||||
headers["Authorization"] = f"Bearer {password}"
|
|
||||||
elif source.auth_type == "api_key":
|
|
||||||
custom_headers = source.get_headers() if hasattr(source, 'get_headers') else {}
|
|
||||||
if custom_headers:
|
|
||||||
headers.update(custom_headers)
|
|
||||||
|
|
||||||
auth = None
|
|
||||||
if hasattr(source, 'auth_type') and source.auth_type == "basic":
|
|
||||||
username = getattr(source, 'username', None)
|
|
||||||
if username:
|
|
||||||
password = source.get_password() if hasattr(source, 'get_password') else getattr(source, 'password', '')
|
|
||||||
auth = (username, password or '')
|
|
||||||
|
|
||||||
source_url = getattr(source, 'url', '')
|
|
||||||
package_url = source_url.rstrip('/') + f'/simple/{normalized_package}/'
|
|
||||||
|
|
||||||
timeout = httpx.Timeout(connect=30.0, read=60.0)
|
|
||||||
|
|
||||||
with httpx.Client(timeout=timeout, follow_redirects=True) as client:
|
|
||||||
response = client.get(package_url, headers=headers, auth=auth)
|
|
||||||
|
|
||||||
if response.status_code == 404:
|
|
||||||
last_error = f"Package not found in {getattr(source, 'name', 'source')}"
|
|
||||||
continue
|
|
||||||
|
|
||||||
if response.status_code != 200:
|
|
||||||
last_error = f"HTTP {response.status_code} from {getattr(source, 'name', 'source')}"
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Parse HTML to find the version
|
|
||||||
html = response.text
|
|
||||||
# Look for links containing the version
|
|
||||||
# Pattern: href="...{package}-{version}...#sha256=..."
|
|
||||||
version_pattern = re.escape(resolve_request.version)
|
|
||||||
link_pattern = rf'href="([^"]+{normalized_package}[^"]*{version_pattern}[^"]*)"'
|
|
||||||
|
|
||||||
matches = re.findall(link_pattern, html, re.IGNORECASE)
|
|
||||||
|
|
||||||
if not matches:
|
|
||||||
# Try with original package name
|
|
||||||
link_pattern = rf'href="([^"]+{re.escape(resolve_request.package)}[^"]*{version_pattern}[^"]*)"'
|
|
||||||
matches = re.findall(link_pattern, html, re.IGNORECASE)
|
|
||||||
|
|
||||||
if matches:
|
|
||||||
# Prefer .tar.gz or .whl files
|
|
||||||
for match in matches:
|
|
||||||
url = match.split('#')[0] # Remove hash fragment
|
|
||||||
if url.endswith('.tar.gz') or url.endswith('.whl'):
|
|
||||||
download_url = url
|
|
||||||
# Extract filename
|
|
||||||
matched_filename = url.split('/')[-1]
|
|
||||||
break
|
|
||||||
if not download_url:
|
|
||||||
# Use first match
|
|
||||||
download_url = matches[0].split('#')[0]
|
|
||||||
matched_filename = download_url.split('/')[-1]
|
|
||||||
break
|
|
||||||
|
|
||||||
last_error = f"Version {resolve_request.version} not found for {resolve_request.package}"
|
|
||||||
|
|
||||||
except httpx.ConnectError as e:
|
|
||||||
last_error = f"Connection failed: {e}"
|
|
||||||
logger.warning(f"Cache resolve: failed to connect to {getattr(source, 'url', 'source')}: {e}")
|
|
||||||
except httpx.TimeoutException as e:
|
|
||||||
last_error = f"Timeout: {e}"
|
|
||||||
logger.warning(f"Cache resolve: timeout connecting to {getattr(source, 'url', 'source')}: {e}")
|
|
||||||
except Exception as e:
|
|
||||||
last_error = str(e)
|
|
||||||
logger.warning(f"Cache resolve: error: {e}")
|
|
||||||
|
|
||||||
if not download_url:
|
|
||||||
raise HTTPException(
|
|
||||||
status_code=404,
|
|
||||||
detail=f"Could not find {resolve_request.package}=={resolve_request.version}: {last_error}"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Now cache the artifact using the existing cache_artifact logic
|
|
||||||
# Construct a CacheRequest
|
|
||||||
cache_request = CacheRequest(
|
|
||||||
url=download_url,
|
|
||||||
source_type="pypi",
|
|
||||||
package_name=normalized_package,
|
|
||||||
tag=matched_filename or resolve_request.version,
|
|
||||||
user_project=resolve_request.user_project,
|
|
||||||
user_package=resolve_request.user_package,
|
|
||||||
user_tag=resolve_request.user_tag,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Call the cache logic
|
|
||||||
return cache_artifact(
|
|
||||||
request=request,
|
|
||||||
cache_request=cache_request,
|
|
||||||
db=db,
|
|
||||||
storage=storage,
|
|
||||||
current_user=current_user,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# --- Upstream Sources Admin API ---
|
# --- Upstream Sources Admin API ---
|
||||||
|
|
||||||
from .schemas import (
|
from .schemas import (
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ class ProjectResponse(BaseModel):
|
|||||||
name: str
|
name: str
|
||||||
description: Optional[str]
|
description: Optional[str]
|
||||||
is_public: bool
|
is_public: bool
|
||||||
is_system: bool = False
|
|
||||||
created_at: datetime
|
created_at: datetime
|
||||||
updated_at: datetime
|
updated_at: datetime
|
||||||
created_by: str
|
created_by: str
|
||||||
@@ -1433,41 +1432,4 @@ class CacheResponse(BaseModel):
|
|||||||
user_reference: Optional[str] = None # e.g., "my-app/npm-deps:lodash-4.17.21"
|
user_reference: Optional[str] = None # e.g., "my-app/npm-deps:lodash-4.17.21"
|
||||||
|
|
||||||
|
|
||||||
class CacheResolveRequest(BaseModel):
|
|
||||||
"""Request to cache an artifact by package coordinates (no URL required).
|
|
||||||
|
|
||||||
The server will construct the appropriate URL based on source_type and
|
|
||||||
configured upstream sources.
|
|
||||||
"""
|
|
||||||
source_type: str
|
|
||||||
package: str
|
|
||||||
version: str
|
|
||||||
user_project: Optional[str] = None
|
|
||||||
user_package: Optional[str] = None
|
|
||||||
user_tag: Optional[str] = None
|
|
||||||
|
|
||||||
@field_validator('source_type')
|
|
||||||
@classmethod
|
|
||||||
def validate_source_type(cls, v: str) -> str:
|
|
||||||
if v not in SOURCE_TYPES:
|
|
||||||
raise ValueError(f"source_type must be one of: {', '.join(SOURCE_TYPES)}")
|
|
||||||
return v
|
|
||||||
|
|
||||||
@field_validator('package')
|
|
||||||
@classmethod
|
|
||||||
def validate_package(cls, v: str) -> str:
|
|
||||||
v = v.strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("package cannot be empty")
|
|
||||||
return v
|
|
||||||
|
|
||||||
@field_validator('version')
|
|
||||||
@classmethod
|
|
||||||
def validate_version(cls, v: str) -> str:
|
|
||||||
v = v.strip()
|
|
||||||
if not v:
|
|
||||||
raise ValueError("version cannot be empty")
|
|
||||||
return v
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -128,9 +128,7 @@ class TestProjectListingFilters:
|
|||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
|
|
||||||
data = response.json()
|
data = response.json()
|
||||||
# Filter out system projects (names starting with "_") as they may have
|
names = [p["name"] for p in data["items"]]
|
||||||
# collation-specific sort behavior and aren't part of the test data
|
|
||||||
names = [p["name"] for p in data["items"] if not p["name"].startswith("_")]
|
|
||||||
assert names == sorted(names)
|
assert names == sorted(names)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,137 +0,0 @@
|
|||||||
"""Integration tests for PyPI transparent proxy."""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import pytest
|
|
||||||
import httpx
|
|
||||||
|
|
||||||
|
|
||||||
def get_base_url():
|
|
||||||
"""Get the base URL for the Orchard server from environment."""
|
|
||||||
return os.environ.get("ORCHARD_TEST_URL", "http://localhost:8080")
|
|
||||||
|
|
||||||
|
|
||||||
class TestPyPIProxyEndpoints:
|
|
||||||
"""Tests for PyPI proxy endpoints.
|
|
||||||
|
|
||||||
These endpoints are public (no auth required) since pip needs to use them.
|
|
||||||
"""
|
|
||||||
|
|
||||||
@pytest.mark.integration
|
|
||||||
def test_pypi_simple_index(self):
|
|
||||||
"""Test that /pypi/simple/ returns HTML response."""
|
|
||||||
with httpx.Client(base_url=get_base_url(), timeout=30.0) as client:
|
|
||||||
response = client.get("/pypi/simple/")
|
|
||||||
# Returns 200 if sources configured, 503 if not
|
|
||||||
assert response.status_code in (200, 503)
|
|
||||||
if response.status_code == 200:
|
|
||||||
assert "text/html" in response.headers.get("content-type", "")
|
|
||||||
else:
|
|
||||||
assert "No PyPI upstream sources configured" in response.json()["detail"]
|
|
||||||
|
|
||||||
@pytest.mark.integration
|
|
||||||
def test_pypi_package_endpoint(self):
|
|
||||||
"""Test that /pypi/simple/{package}/ returns appropriate response."""
|
|
||||||
with httpx.Client(base_url=get_base_url(), timeout=30.0) as client:
|
|
||||||
response = client.get("/pypi/simple/requests/")
|
|
||||||
# Returns 200 if sources configured and package found,
|
|
||||||
# 404 if package not found, 503 if no sources
|
|
||||||
assert response.status_code in (200, 404, 503)
|
|
||||||
if response.status_code == 200:
|
|
||||||
assert "text/html" in response.headers.get("content-type", "")
|
|
||||||
elif response.status_code == 404:
|
|
||||||
assert "not found" in response.json()["detail"].lower()
|
|
||||||
else: # 503
|
|
||||||
assert "No PyPI upstream sources configured" in response.json()["detail"]
|
|
||||||
|
|
||||||
@pytest.mark.integration
|
|
||||||
def test_pypi_download_missing_upstream_param(self):
|
|
||||||
"""Test that /pypi/simple/{package}/{filename} requires upstream param."""
|
|
||||||
with httpx.Client(base_url=get_base_url(), timeout=30.0) as client:
|
|
||||||
response = client.get("/pypi/simple/requests/requests-2.31.0.tar.gz")
|
|
||||||
assert response.status_code == 400
|
|
||||||
assert "upstream" in response.json()["detail"].lower()
|
|
||||||
|
|
||||||
|
|
||||||
class TestPyPILinkRewriting:
|
|
||||||
"""Tests for URL rewriting in PyPI proxy responses."""
|
|
||||||
|
|
||||||
def test_rewrite_package_links(self):
|
|
||||||
"""Test that download links are rewritten to go through proxy."""
|
|
||||||
from app.pypi_proxy import _rewrite_package_links
|
|
||||||
|
|
||||||
html = '''
|
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
<a href="https://files.pythonhosted.org/packages/ab/cd/requests-2.31.0.tar.gz#sha256=abc123">requests-2.31.0.tar.gz</a>
|
|
||||||
<a href="https://files.pythonhosted.org/packages/ef/gh/requests-2.31.0-py3-none-any.whl#sha256=def456">requests-2.31.0-py3-none-any.whl</a>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
'''
|
|
||||||
|
|
||||||
# upstream_base_url is used to resolve relative URLs (not needed here since URLs are absolute)
|
|
||||||
result = _rewrite_package_links(
|
|
||||||
html,
|
|
||||||
"http://localhost:8080",
|
|
||||||
"requests",
|
|
||||||
"https://pypi.org/simple/requests/"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Links should be rewritten to go through our proxy
|
|
||||||
assert "/pypi/simple/requests/requests-2.31.0.tar.gz?upstream=" in result
|
|
||||||
assert "/pypi/simple/requests/requests-2.31.0-py3-none-any.whl?upstream=" in result
|
|
||||||
# Original URLs should be encoded in upstream param
|
|
||||||
assert "files.pythonhosted.org" in result
|
|
||||||
# Hash fragments should be preserved
|
|
||||||
assert "#sha256=abc123" in result
|
|
||||||
assert "#sha256=def456" in result
|
|
||||||
|
|
||||||
def test_rewrite_relative_links(self):
|
|
||||||
"""Test that relative URLs are resolved to absolute URLs."""
|
|
||||||
from app.pypi_proxy import _rewrite_package_links
|
|
||||||
|
|
||||||
# Artifactory-style relative URLs
|
|
||||||
html = '''
|
|
||||||
<html>
|
|
||||||
<body>
|
|
||||||
<a href="../../packages/ab/cd/requests-2.31.0.tar.gz#sha256=abc123">requests-2.31.0.tar.gz</a>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
'''
|
|
||||||
|
|
||||||
result = _rewrite_package_links(
|
|
||||||
html,
|
|
||||||
"https://orchard.example.com",
|
|
||||||
"requests",
|
|
||||||
"https://artifactory.example.com/api/pypi/pypi-remote/simple/requests/"
|
|
||||||
)
|
|
||||||
|
|
||||||
# The relative URL should be resolved to absolute
|
|
||||||
# ../../packages/ab/cd/... from /api/pypi/pypi-remote/simple/requests/ resolves to /api/pypi/pypi-remote/packages/ab/cd/...
|
|
||||||
assert "upstream=https%3A%2F%2Fartifactory.example.com%2Fapi%2Fpypi%2Fpypi-remote%2Fpackages" in result
|
|
||||||
# Hash fragment should be preserved
|
|
||||||
assert "#sha256=abc123" in result
|
|
||||||
|
|
||||||
|
|
||||||
class TestPyPIPackageNormalization:
|
|
||||||
"""Tests for PyPI package name normalization."""
|
|
||||||
|
|
||||||
@pytest.mark.integration
|
|
||||||
def test_package_name_normalized(self):
|
|
||||||
"""Test that package names are normalized per PEP 503.
|
|
||||||
|
|
||||||
Different capitalizations/separators should all be valid paths.
|
|
||||||
The endpoint normalizes to lowercase with hyphens before lookup.
|
|
||||||
"""
|
|
||||||
with httpx.Client(base_url=get_base_url(), timeout=30.0) as client:
|
|
||||||
# Test various name formats - all should be valid endpoint paths
|
|
||||||
for package_name in ["Requests", "some_package", "some-package"]:
|
|
||||||
response = client.get(f"/pypi/simple/{package_name}/")
|
|
||||||
# 200 = found, 404 = not found, 503 = no sources configured
|
|
||||||
assert response.status_code in (200, 404, 503), \
|
|
||||||
f"Unexpected status {response.status_code} for {package_name}"
|
|
||||||
|
|
||||||
# Verify response is appropriate for the status code
|
|
||||||
if response.status_code == 200:
|
|
||||||
assert "text/html" in response.headers.get("content-type", "")
|
|
||||||
elif response.status_code == 503:
|
|
||||||
assert "No PyPI upstream sources configured" in response.json()["detail"]
|
|
||||||
@@ -272,7 +272,7 @@
|
|||||||
.footer {
|
.footer {
|
||||||
background: var(--bg-secondary);
|
background: var(--bg-secondary);
|
||||||
border-top: 1px solid var(--border-primary);
|
border-top: 1px solid var(--border-primary);
|
||||||
padding: 12px 0;
|
padding: 24px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.footer-content {
|
.footer-content {
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
.sources-table th,
|
.sources-table th,
|
||||||
.sources-table td {
|
.sources-table td {
|
||||||
padding: 0.75rem 1rem;
|
padding: 0.75rem 1rem;
|
||||||
text-align: center;
|
text-align: left;
|
||||||
border-bottom: 1px solid var(--border-color);
|
border-bottom: 1px solid var(--border-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,11 +91,6 @@
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Name column should be left-aligned */
|
|
||||||
.sources-table td:first-child {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.url-cell {
|
.url-cell {
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
@@ -103,7 +98,6 @@
|
|||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-align: left;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Badges */
|
/* Badges */
|
||||||
@@ -132,12 +126,6 @@
|
|||||||
color: #c62828;
|
color: #c62828;
|
||||||
}
|
}
|
||||||
|
|
||||||
.coming-soon-badge {
|
|
||||||
color: #9e9e9e;
|
|
||||||
font-style: italic;
|
|
||||||
font-size: 0.85em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Actions */
|
/* Actions */
|
||||||
.actions-cell {
|
.actions-cell {
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
@@ -255,22 +243,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.btn-sm {
|
.btn-sm {
|
||||||
padding: 0.25rem 0.75rem;
|
padding: 0.25rem 0.5rem;
|
||||||
font-size: 0.8rem;
|
font-size: 0.8rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-secondary {
|
|
||||||
background-color: var(--bg-tertiary);
|
|
||||||
border-color: var(--border-color);
|
|
||||||
color: var(--text-primary);
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-secondary:hover {
|
|
||||||
background-color: var(--bg-secondary);
|
|
||||||
border-color: var(--text-secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.empty-message {
|
.empty-message {
|
||||||
color: var(--text-secondary);
|
color: var(--text-secondary);
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import { UpstreamSource, SourceType, AuthType } from '../types';
|
|||||||
import './AdminCachePage.css';
|
import './AdminCachePage.css';
|
||||||
|
|
||||||
const SOURCE_TYPES: SourceType[] = ['npm', 'pypi', 'maven', 'docker', 'helm', 'nuget', 'deb', 'rpm', 'generic'];
|
const SOURCE_TYPES: SourceType[] = ['npm', 'pypi', 'maven', 'docker', 'helm', 'nuget', 'deb', 'rpm', 'generic'];
|
||||||
const SUPPORTED_SOURCE_TYPES: Set<SourceType> = new Set(['pypi', 'generic']);
|
|
||||||
const AUTH_TYPES: AuthType[] = ['none', 'basic', 'bearer', 'api_key'];
|
const AUTH_TYPES: AuthType[] = ['none', 'basic', 'bearer', 'api_key'];
|
||||||
|
|
||||||
function AdminCachePage() {
|
function AdminCachePage() {
|
||||||
@@ -273,7 +272,8 @@ function AdminCachePage() {
|
|||||||
<th>URL</th>
|
<th>URL</th>
|
||||||
<th>Priority</th>
|
<th>Priority</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Test</th>
|
<th>Source</th>
|
||||||
|
<th></th>
|
||||||
<th>Actions</th>
|
<th>Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -282,23 +282,24 @@ function AdminCachePage() {
|
|||||||
<tr key={source.id} className={source.enabled ? '' : 'disabled-row'}>
|
<tr key={source.id} className={source.enabled ? '' : 'disabled-row'}>
|
||||||
<td>
|
<td>
|
||||||
<span className="source-name">{source.name}</span>
|
<span className="source-name">{source.name}</span>
|
||||||
{source.source === 'env' && (
|
|
||||||
<span className="env-badge" title="Defined via environment variable">ENV</span>
|
|
||||||
)}
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>{source.source_type}</td>
|
||||||
{source.source_type}
|
<td className="url-cell">{source.url}</td>
|
||||||
{!SUPPORTED_SOURCE_TYPES.has(source.source_type) && (
|
|
||||||
<span className="coming-soon-badge"> (coming soon)</span>
|
|
||||||
)}
|
|
||||||
</td>
|
|
||||||
<td className="url-cell" title={source.url}>{source.url}</td>
|
|
||||||
<td>{source.priority}</td>
|
<td>{source.priority}</td>
|
||||||
<td>
|
<td>
|
||||||
<span className={`status-badge ${source.enabled ? 'enabled' : 'disabled'}`}>
|
<span className={`status-badge ${source.enabled ? 'enabled' : 'disabled'}`}>
|
||||||
{source.enabled ? 'Enabled' : 'Disabled'}
|
{source.enabled ? 'Enabled' : 'Disabled'}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
|
<td>
|
||||||
|
{source.source === 'env' ? (
|
||||||
|
<span className="env-badge" title="Defined via environment variable">
|
||||||
|
ENV
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
'Database'
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
<td className="test-cell">
|
<td className="test-cell">
|
||||||
{testingId === source.id ? (
|
{testingId === source.id ? (
|
||||||
<span className="test-dot testing" title="Testing...">●</span>
|
<span className="test-dot testing" title="Testing...">●</span>
|
||||||
@@ -316,14 +317,14 @@ function AdminCachePage() {
|
|||||||
</td>
|
</td>
|
||||||
<td className="actions-cell">
|
<td className="actions-cell">
|
||||||
<button
|
<button
|
||||||
className="btn btn-sm btn-secondary"
|
className="btn btn-sm"
|
||||||
onClick={() => handleTest(source)}
|
onClick={() => handleTest(source)}
|
||||||
disabled={testingId === source.id}
|
disabled={testingId === source.id}
|
||||||
>
|
>
|
||||||
Test
|
Test
|
||||||
</button>
|
</button>
|
||||||
{source.source !== 'env' && (
|
{source.source !== 'env' && (
|
||||||
<button className="btn btn-sm btn-secondary" onClick={() => openEditForm(source)}>
|
<button className="btn btn-sm" onClick={() => openEditForm(source)}>
|
||||||
Edit
|
Edit
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
@@ -365,7 +366,7 @@ function AdminCachePage() {
|
|||||||
>
|
>
|
||||||
{SOURCE_TYPES.map((type) => (
|
{SOURCE_TYPES.map((type) => (
|
||||||
<option key={type} value={type}>
|
<option key={type} value={type}>
|
||||||
{type}{!SUPPORTED_SOURCE_TYPES.has(type) ? ' (coming soon)' : ''}
|
{type}
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -249,7 +249,7 @@ function Home() {
|
|||||||
key: 'created_by',
|
key: 'created_by',
|
||||||
header: 'Owner',
|
header: 'Owner',
|
||||||
className: 'cell-owner',
|
className: 'cell-owner',
|
||||||
render: (project) => project.team_name || project.created_by,
|
render: (project) => project.created_by,
|
||||||
},
|
},
|
||||||
...(user
|
...(user
|
||||||
? [
|
? [
|
||||||
|
|||||||
@@ -793,194 +793,4 @@ tr:hover .copy-btn {
|
|||||||
.ensure-file-modal {
|
.ensure-file-modal {
|
||||||
max-height: 90vh;
|
max-height: 90vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.action-menu-dropdown {
|
|
||||||
right: 0;
|
|
||||||
left: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Header upload button */
|
|
||||||
.header-upload-btn {
|
|
||||||
margin-left: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Tag/Version cell */
|
|
||||||
.tag-version-cell {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-version-cell .version-badge {
|
|
||||||
font-size: 0.75rem;
|
|
||||||
color: var(--text-muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Icon buttons */
|
|
||||||
.btn-icon {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
padding: 0;
|
|
||||||
background: transparent;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
border-radius: var(--radius-sm);
|
|
||||||
color: var(--text-secondary);
|
|
||||||
cursor: pointer;
|
|
||||||
transition: all var(--transition-fast);
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-icon:hover {
|
|
||||||
background: var(--bg-hover);
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Action menu */
|
|
||||||
.action-buttons {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.action-menu {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Action menu backdrop for click-outside */
|
|
||||||
.action-menu-backdrop {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
|
||||||
z-index: 999;
|
|
||||||
}
|
|
||||||
|
|
||||||
.action-menu-dropdown {
|
|
||||||
position: fixed;
|
|
||||||
z-index: 1000;
|
|
||||||
min-width: 180px;
|
|
||||||
padding: 4px 0;
|
|
||||||
background: var(--bg-secondary);
|
|
||||||
border: 1px solid var(--border-primary);
|
|
||||||
border-radius: var(--radius-md);
|
|
||||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
|
||||||
}
|
|
||||||
|
|
||||||
.action-menu-dropdown button {
|
|
||||||
display: block;
|
|
||||||
width: 100%;
|
|
||||||
padding: 8px 12px;
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
text-align: left;
|
|
||||||
font-size: 0.875rem;
|
|
||||||
color: var(--text-primary);
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background var(--transition-fast);
|
|
||||||
}
|
|
||||||
|
|
||||||
.action-menu-dropdown button:hover {
|
|
||||||
background: var(--bg-hover);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Upload Modal */
|
|
||||||
.upload-modal,
|
|
||||||
.create-tag-modal {
|
|
||||||
background: var(--bg-secondary);
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
width: 90%;
|
|
||||||
max-width: 500px;
|
|
||||||
max-height: 90vh;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-header {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: space-between;
|
|
||||||
padding: 16px 20px;
|
|
||||||
border-bottom: 1px solid var(--border-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-header h3 {
|
|
||||||
margin: 0;
|
|
||||||
font-size: 1.125rem;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-body {
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-description {
|
|
||||||
margin-bottom: 16px;
|
|
||||||
color: var(--text-secondary);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-actions {
|
|
||||||
display: flex;
|
|
||||||
justify-content: flex-end;
|
|
||||||
gap: 12px;
|
|
||||||
margin-top: 20px;
|
|
||||||
padding-top: 16px;
|
|
||||||
border-top: 1px solid var(--border-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Dependencies Modal */
|
|
||||||
.deps-modal {
|
|
||||||
background: var(--bg-secondary);
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
width: 90%;
|
|
||||||
max-width: 600px;
|
|
||||||
max-height: 80vh;
|
|
||||||
overflow: hidden;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.deps-modal .modal-body {
|
|
||||||
overflow-y: auto;
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.deps-modal-controls {
|
|
||||||
display: flex;
|
|
||||||
gap: 8px;
|
|
||||||
margin-bottom: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Artifact ID Modal */
|
|
||||||
.artifact-id-modal {
|
|
||||||
background: var(--bg-secondary);
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
width: 90%;
|
|
||||||
max-width: 500px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.artifact-id-display {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 12px;
|
|
||||||
padding: 16px;
|
|
||||||
background: var(--bg-tertiary);
|
|
||||||
border-radius: var(--radius-md);
|
|
||||||
border: 1px solid var(--border-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.artifact-id-display code {
|
|
||||||
font-family: 'JetBrains Mono', 'Fira Code', 'Consolas', monospace;
|
|
||||||
font-size: 0.8125rem;
|
|
||||||
color: var(--text-primary);
|
|
||||||
word-break: break-all;
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.artifact-id-display .copy-btn {
|
|
||||||
opacity: 1;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,17 +63,12 @@ function PackagePage() {
|
|||||||
const [accessDenied, setAccessDenied] = useState(false);
|
const [accessDenied, setAccessDenied] = useState(false);
|
||||||
const [uploadTag, setUploadTag] = useState('');
|
const [uploadTag, setUploadTag] = useState('');
|
||||||
const [uploadSuccess, setUploadSuccess] = useState<string | null>(null);
|
const [uploadSuccess, setUploadSuccess] = useState<string | null>(null);
|
||||||
|
const [artifactIdInput, setArtifactIdInput] = useState('');
|
||||||
const [accessLevel, setAccessLevel] = useState<AccessLevel | null>(null);
|
const [accessLevel, setAccessLevel] = useState<AccessLevel | null>(null);
|
||||||
const [createTagName, setCreateTagName] = useState('');
|
const [createTagName, setCreateTagName] = useState('');
|
||||||
const [createTagArtifactId, setCreateTagArtifactId] = useState('');
|
const [createTagArtifactId, setCreateTagArtifactId] = useState('');
|
||||||
const [createTagLoading, setCreateTagLoading] = useState(false);
|
const [createTagLoading, setCreateTagLoading] = useState(false);
|
||||||
|
|
||||||
// UI state
|
|
||||||
const [showUploadModal, setShowUploadModal] = useState(false);
|
|
||||||
const [showCreateTagModal, setShowCreateTagModal] = useState(false);
|
|
||||||
const [openMenuId, setOpenMenuId] = useState<string | null>(null);
|
|
||||||
const [menuPosition, setMenuPosition] = useState<{ top: number; left: number } | null>(null);
|
|
||||||
|
|
||||||
// Dependencies state
|
// Dependencies state
|
||||||
const [selectedTag, setSelectedTag] = useState<TagDetail | null>(null);
|
const [selectedTag, setSelectedTag] = useState<TagDetail | null>(null);
|
||||||
const [dependencies, setDependencies] = useState<Dependency[]>([]);
|
const [dependencies, setDependencies] = useState<Dependency[]>([]);
|
||||||
@@ -91,13 +86,6 @@ function PackagePage() {
|
|||||||
// Dependency graph modal state
|
// Dependency graph modal state
|
||||||
const [showGraph, setShowGraph] = useState(false);
|
const [showGraph, setShowGraph] = useState(false);
|
||||||
|
|
||||||
// Dependencies modal state
|
|
||||||
const [showDepsModal, setShowDepsModal] = useState(false);
|
|
||||||
|
|
||||||
// Artifact ID modal state
|
|
||||||
const [showArtifactIdModal, setShowArtifactIdModal] = useState(false);
|
|
||||||
const [viewArtifactId, setViewArtifactId] = useState<string | null>(null);
|
|
||||||
|
|
||||||
// Ensure file modal state
|
// Ensure file modal state
|
||||||
const [showEnsureFile, setShowEnsureFile] = useState(false);
|
const [showEnsureFile, setShowEnsureFile] = useState(false);
|
||||||
const [ensureFileContent, setEnsureFileContent] = useState<string | null>(null);
|
const [ensureFileContent, setEnsureFileContent] = useState<string | null>(null);
|
||||||
@@ -108,9 +96,6 @@ function PackagePage() {
|
|||||||
// Derived permissions
|
// Derived permissions
|
||||||
const canWrite = accessLevel === 'write' || accessLevel === 'admin';
|
const canWrite = accessLevel === 'write' || accessLevel === 'admin';
|
||||||
|
|
||||||
// Detect system projects (convention: name starts with "_")
|
|
||||||
const isSystemProject = projectName?.startsWith('_') ?? false;
|
|
||||||
|
|
||||||
// Get params from URL
|
// Get params from URL
|
||||||
const page = parseInt(searchParams.get('page') || '1', 10);
|
const page = parseInt(searchParams.get('page') || '1', 10);
|
||||||
const search = searchParams.get('search') || '';
|
const search = searchParams.get('search') || '';
|
||||||
@@ -338,212 +323,92 @@ function PackagePage() {
|
|||||||
setSelectedTag(tag);
|
setSelectedTag(tag);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleMenuOpen = (e: React.MouseEvent, tagId: string) => {
|
const columns = [
|
||||||
e.stopPropagation();
|
{
|
||||||
if (openMenuId === tagId) {
|
key: 'name',
|
||||||
setOpenMenuId(null);
|
header: 'Tag',
|
||||||
setMenuPosition(null);
|
sortable: true,
|
||||||
} else {
|
render: (t: TagDetail) => (
|
||||||
const rect = e.currentTarget.getBoundingClientRect();
|
<strong
|
||||||
setMenuPosition({ top: rect.bottom + 4, left: rect.right - 180 });
|
className={`tag-name-link ${selectedTag?.id === t.id ? 'selected' : ''}`}
|
||||||
setOpenMenuId(tagId);
|
onClick={() => handleTagSelect(t)}
|
||||||
}
|
style={{ cursor: 'pointer' }}
|
||||||
};
|
|
||||||
|
|
||||||
// System projects show Version first, regular projects show Tag first
|
|
||||||
const columns = isSystemProject
|
|
||||||
? [
|
|
||||||
// System project columns: Version first, then Filename
|
|
||||||
{
|
|
||||||
key: 'version',
|
|
||||||
header: 'Version',
|
|
||||||
sortable: true,
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<strong
|
|
||||||
className={`tag-name-link ${selectedTag?.id === t.id ? 'selected' : ''}`}
|
|
||||||
onClick={() => handleTagSelect(t)}
|
|
||||||
style={{ cursor: 'pointer' }}
|
|
||||||
>
|
|
||||||
<span className="version-badge">{t.version || t.name}</span>
|
|
||||||
</strong>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'artifact_original_name',
|
|
||||||
header: 'Filename',
|
|
||||||
className: 'cell-truncate',
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<span title={t.artifact_original_name || t.name}>{t.artifact_original_name || t.name}</span>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'artifact_size',
|
|
||||||
header: 'Size',
|
|
||||||
render: (t: TagDetail) => <span>{formatBytes(t.artifact_size)}</span>,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'created_at',
|
|
||||||
header: 'Cached',
|
|
||||||
sortable: true,
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<span>{new Date(t.created_at).toLocaleDateString()}</span>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'actions',
|
|
||||||
header: '',
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<div className="action-buttons">
|
|
||||||
<a
|
|
||||||
href={getDownloadUrl(projectName!, packageName!, t.name)}
|
|
||||||
className="btn btn-icon"
|
|
||||||
download
|
|
||||||
title="Download"
|
|
||||||
>
|
|
||||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
|
|
||||||
<polyline points="7 10 12 15 17 10" />
|
|
||||||
<line x1="12" y1="15" x2="12" y2="3" />
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<button
|
|
||||||
className="btn btn-icon"
|
|
||||||
onClick={(e) => handleMenuOpen(e, t.id)}
|
|
||||||
title="More actions"
|
|
||||||
>
|
|
||||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<circle cx="12" cy="12" r="1" />
|
|
||||||
<circle cx="12" cy="5" r="1" />
|
|
||||||
<circle cx="12" cy="19" r="1" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: [
|
|
||||||
// Regular project columns: Tag, Version, Filename
|
|
||||||
{
|
|
||||||
key: 'name',
|
|
||||||
header: 'Tag',
|
|
||||||
sortable: true,
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<strong
|
|
||||||
className={`tag-name-link ${selectedTag?.id === t.id ? 'selected' : ''}`}
|
|
||||||
onClick={() => handleTagSelect(t)}
|
|
||||||
style={{ cursor: 'pointer' }}
|
|
||||||
>
|
|
||||||
{t.name}
|
|
||||||
</strong>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'version',
|
|
||||||
header: 'Version',
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<span className="version-badge">{t.version || '—'}</span>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'artifact_original_name',
|
|
||||||
header: 'Filename',
|
|
||||||
className: 'cell-truncate',
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<span title={t.artifact_original_name || undefined}>{t.artifact_original_name || '—'}</span>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'artifact_size',
|
|
||||||
header: 'Size',
|
|
||||||
render: (t: TagDetail) => <span>{formatBytes(t.artifact_size)}</span>,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'created_at',
|
|
||||||
header: 'Created',
|
|
||||||
sortable: true,
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<span title={`by ${t.created_by}`}>{new Date(t.created_at).toLocaleDateString()}</span>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: 'actions',
|
|
||||||
header: '',
|
|
||||||
render: (t: TagDetail) => (
|
|
||||||
<div className="action-buttons">
|
|
||||||
<a
|
|
||||||
href={getDownloadUrl(projectName!, packageName!, t.name)}
|
|
||||||
className="btn btn-icon"
|
|
||||||
download
|
|
||||||
title="Download"
|
|
||||||
>
|
|
||||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
|
|
||||||
<polyline points="7 10 12 15 17 10" />
|
|
||||||
<line x1="12" y1="15" x2="12" y2="3" />
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<button
|
|
||||||
className="btn btn-icon"
|
|
||||||
onClick={(e) => handleMenuOpen(e, t.id)}
|
|
||||||
title="More actions"
|
|
||||||
>
|
|
||||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<circle cx="12" cy="12" r="1" />
|
|
||||||
<circle cx="12" cy="5" r="1" />
|
|
||||||
<circle cx="12" cy="19" r="1" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
// Find the tag for the open menu
|
|
||||||
const openMenuTag = tags.find(t => t.id === openMenuId);
|
|
||||||
|
|
||||||
// Close menu when clicking outside
|
|
||||||
const handleClickOutside = () => {
|
|
||||||
if (openMenuId) {
|
|
||||||
setOpenMenuId(null);
|
|
||||||
setMenuPosition(null);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Render dropdown menu as a portal-like element
|
|
||||||
const renderActionMenu = () => {
|
|
||||||
if (!openMenuId || !menuPosition || !openMenuTag) return null;
|
|
||||||
const t = openMenuTag;
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className="action-menu-backdrop"
|
|
||||||
onClick={handleClickOutside}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
className="action-menu-dropdown"
|
|
||||||
style={{ top: menuPosition.top, left: menuPosition.left }}
|
|
||||||
onClick={(e) => e.stopPropagation()}
|
|
||||||
>
|
>
|
||||||
<button onClick={() => { setViewArtifactId(t.artifact_id); setShowArtifactIdModal(true); setOpenMenuId(null); setMenuPosition(null); }}>
|
{t.name}
|
||||||
View Artifact ID
|
</strong>
|
||||||
</button>
|
),
|
||||||
<button onClick={() => { navigator.clipboard.writeText(t.artifact_id); setOpenMenuId(null); setMenuPosition(null); }}>
|
},
|
||||||
Copy Artifact ID
|
{
|
||||||
</button>
|
key: 'version',
|
||||||
<button onClick={() => { fetchEnsureFileForTag(t.name); setOpenMenuId(null); setMenuPosition(null); }}>
|
header: 'Version',
|
||||||
View Ensure File
|
render: (t: TagDetail) => (
|
||||||
</button>
|
<span className="version-badge">{t.version || '-'}</span>
|
||||||
{canWrite && !isSystemProject && (
|
),
|
||||||
<button onClick={() => { setCreateTagArtifactId(t.artifact_id); setShowCreateTagModal(true); setOpenMenuId(null); setMenuPosition(null); }}>
|
},
|
||||||
Create/Update Tag
|
{
|
||||||
</button>
|
key: 'artifact_id',
|
||||||
)}
|
header: 'Artifact ID',
|
||||||
<button onClick={() => { handleTagSelect(t); setShowDepsModal(true); setOpenMenuId(null); setMenuPosition(null); }}>
|
render: (t: TagDetail) => (
|
||||||
View Dependencies
|
<div className="artifact-id-cell">
|
||||||
</button>
|
<code className="artifact-id">{t.artifact_id.substring(0, 12)}...</code>
|
||||||
|
<CopyButton text={t.artifact_id} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
),
|
||||||
);
|
},
|
||||||
};
|
{
|
||||||
|
key: 'artifact_size',
|
||||||
|
header: 'Size',
|
||||||
|
render: (t: TagDetail) => <span>{formatBytes(t.artifact_size)}</span>,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'artifact_content_type',
|
||||||
|
header: 'Type',
|
||||||
|
render: (t: TagDetail) => (
|
||||||
|
<span className="content-type">{t.artifact_content_type || '-'}</span>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'artifact_original_name',
|
||||||
|
header: 'Filename',
|
||||||
|
className: 'cell-truncate',
|
||||||
|
render: (t: TagDetail) => (
|
||||||
|
<span title={t.artifact_original_name || undefined}>{t.artifact_original_name || '-'}</span>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'created_at',
|
||||||
|
header: 'Created',
|
||||||
|
sortable: true,
|
||||||
|
render: (t: TagDetail) => (
|
||||||
|
<div className="created-cell">
|
||||||
|
<span>{new Date(t.created_at).toLocaleString()}</span>
|
||||||
|
<span className="created-by">by {t.created_by}</span>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'actions',
|
||||||
|
header: 'Actions',
|
||||||
|
render: (t: TagDetail) => (
|
||||||
|
<div className="action-buttons">
|
||||||
|
<button
|
||||||
|
className="btn btn-secondary btn-small"
|
||||||
|
onClick={() => fetchEnsureFileForTag(t.name)}
|
||||||
|
title="View orchard.ensure file"
|
||||||
|
>
|
||||||
|
Ensure
|
||||||
|
</button>
|
||||||
|
<a
|
||||||
|
href={getDownloadUrl(projectName!, packageName!, t.name)}
|
||||||
|
className="btn btn-secondary btn-small"
|
||||||
|
download
|
||||||
|
>
|
||||||
|
Download
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
if (loading && !tagsData) {
|
if (loading && !tagsData) {
|
||||||
return <div className="loading">Loading...</div>;
|
return <div className="loading">Loading...</div>;
|
||||||
@@ -586,19 +451,6 @@ function PackagePage() {
|
|||||||
<div className="page-header__title-row">
|
<div className="page-header__title-row">
|
||||||
<h1>{packageName}</h1>
|
<h1>{packageName}</h1>
|
||||||
{pkg && <Badge variant="default">{pkg.format}</Badge>}
|
{pkg && <Badge variant="default">{pkg.format}</Badge>}
|
||||||
{user && canWrite && !isSystemProject && (
|
|
||||||
<button
|
|
||||||
className="btn btn-primary btn-small header-upload-btn"
|
|
||||||
onClick={() => setShowUploadModal(true)}
|
|
||||||
>
|
|
||||||
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" style={{ marginRight: '6px' }}>
|
|
||||||
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
|
|
||||||
<polyline points="17 8 12 3 7 8" />
|
|
||||||
<line x1="12" y1="3" x2="12" y2="15" />
|
|
||||||
</svg>
|
|
||||||
Upload
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
{pkg?.description && <p className="description">{pkg.description}</p>}
|
{pkg?.description && <p className="description">{pkg.description}</p>}
|
||||||
<div className="page-header__meta">
|
<div className="page-header__meta">
|
||||||
@@ -616,14 +468,14 @@ function PackagePage() {
|
|||||||
</div>
|
</div>
|
||||||
{pkg && (pkg.tag_count !== undefined || pkg.artifact_count !== undefined) && (
|
{pkg && (pkg.tag_count !== undefined || pkg.artifact_count !== undefined) && (
|
||||||
<div className="package-header-stats">
|
<div className="package-header-stats">
|
||||||
{!isSystemProject && pkg.tag_count !== undefined && (
|
{pkg.tag_count !== undefined && (
|
||||||
<span className="stat-item">
|
<span className="stat-item">
|
||||||
<strong>{pkg.tag_count}</strong> tags
|
<strong>{pkg.tag_count}</strong> tags
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{pkg.artifact_count !== undefined && (
|
{pkg.artifact_count !== undefined && (
|
||||||
<span className="stat-item">
|
<span className="stat-item">
|
||||||
<strong>{pkg.artifact_count}</strong> {isSystemProject ? 'versions' : 'artifacts'}
|
<strong>{pkg.artifact_count}</strong> artifacts
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{pkg.total_size !== undefined && pkg.total_size > 0 && (
|
{pkg.total_size !== undefined && pkg.total_size > 0 && (
|
||||||
@@ -631,7 +483,7 @@ function PackagePage() {
|
|||||||
<strong>{formatBytes(pkg.total_size)}</strong> total
|
<strong>{formatBytes(pkg.total_size)}</strong> total
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{!isSystemProject && pkg.latest_tag && (
|
{pkg.latest_tag && (
|
||||||
<span className="stat-item">
|
<span className="stat-item">
|
||||||
Latest: <strong className="accent">{pkg.latest_tag}</strong>
|
Latest: <strong className="accent">{pkg.latest_tag}</strong>
|
||||||
</span>
|
</span>
|
||||||
@@ -644,9 +496,44 @@ function PackagePage() {
|
|||||||
{error && <div className="error-message">{error}</div>}
|
{error && <div className="error-message">{error}</div>}
|
||||||
{uploadSuccess && <div className="success-message">{uploadSuccess}</div>}
|
{uploadSuccess && <div className="success-message">{uploadSuccess}</div>}
|
||||||
|
|
||||||
|
{user && (
|
||||||
|
<div className="upload-section card">
|
||||||
|
<h3>Upload Artifact</h3>
|
||||||
|
{canWrite ? (
|
||||||
|
<div className="upload-form">
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="upload-tag">Tag (optional)</label>
|
||||||
|
<input
|
||||||
|
id="upload-tag"
|
||||||
|
type="text"
|
||||||
|
value={uploadTag}
|
||||||
|
onChange={(e) => setUploadTag(e.target.value)}
|
||||||
|
placeholder="v1.0.0, latest, stable..."
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<DragDropUpload
|
||||||
|
projectName={projectName!}
|
||||||
|
packageName={packageName!}
|
||||||
|
tag={uploadTag || undefined}
|
||||||
|
onUploadComplete={handleUploadComplete}
|
||||||
|
onUploadError={handleUploadError}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<DragDropUpload
|
||||||
|
projectName={projectName!}
|
||||||
|
packageName={packageName!}
|
||||||
|
disabled={true}
|
||||||
|
disabledReason="You have read-only access to this project and cannot upload artifacts."
|
||||||
|
onUploadComplete={handleUploadComplete}
|
||||||
|
onUploadError={handleUploadError}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="section-header">
|
<div className="section-header">
|
||||||
<h2>{isSystemProject ? 'Versions' : 'Tags / Versions'}</h2>
|
<h2>Tags / Versions</h2>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="list-controls">
|
<div className="list-controls">
|
||||||
@@ -690,6 +577,110 @@ function PackagePage() {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Dependencies Section */}
|
||||||
|
{tags.length > 0 && (
|
||||||
|
<div className="dependencies-section card">
|
||||||
|
<div className="dependencies-header">
|
||||||
|
<h3>Dependencies</h3>
|
||||||
|
<div className="dependencies-controls">
|
||||||
|
{selectedTag && (
|
||||||
|
<>
|
||||||
|
<button
|
||||||
|
className="btn btn-secondary btn-small"
|
||||||
|
onClick={fetchEnsureFile}
|
||||||
|
disabled={ensureFileLoading}
|
||||||
|
title="View orchard.ensure file"
|
||||||
|
>
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" style={{ marginRight: '6px' }}>
|
||||||
|
<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path>
|
||||||
|
<polyline points="14 2 14 8 20 8"></polyline>
|
||||||
|
<line x1="16" y1="13" x2="8" y2="13"></line>
|
||||||
|
<line x1="16" y1="17" x2="8" y2="17"></line>
|
||||||
|
<polyline points="10 9 9 9 8 9"></polyline>
|
||||||
|
</svg>
|
||||||
|
{ensureFileLoading ? 'Loading...' : 'View Ensure File'}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
className="btn btn-secondary btn-small"
|
||||||
|
onClick={() => setShowGraph(true)}
|
||||||
|
title="View full dependency tree"
|
||||||
|
>
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" style={{ marginRight: '6px' }}>
|
||||||
|
<circle cx="12" cy="12" r="3"></circle>
|
||||||
|
<circle cx="4" cy="4" r="2"></circle>
|
||||||
|
<circle cx="20" cy="4" r="2"></circle>
|
||||||
|
<circle cx="4" cy="20" r="2"></circle>
|
||||||
|
<circle cx="20" cy="20" r="2"></circle>
|
||||||
|
<line x1="9.5" y1="9.5" x2="5.5" y2="5.5"></line>
|
||||||
|
<line x1="14.5" y1="9.5" x2="18.5" y2="5.5"></line>
|
||||||
|
<line x1="9.5" y1="14.5" x2="5.5" y2="18.5"></line>
|
||||||
|
<line x1="14.5" y1="14.5" x2="18.5" y2="18.5"></line>
|
||||||
|
</svg>
|
||||||
|
View Graph
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="dependencies-tag-select">
|
||||||
|
{selectedTag && (
|
||||||
|
<select
|
||||||
|
className="tag-selector"
|
||||||
|
value={selectedTag.id}
|
||||||
|
onChange={(e) => {
|
||||||
|
const tag = tags.find(t => t.id === e.target.value);
|
||||||
|
if (tag) setSelectedTag(tag);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{tags.map(t => (
|
||||||
|
<option key={t.id} value={t.id}>
|
||||||
|
{t.name}{t.version ? ` (${t.version})` : ''}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{depsLoading ? (
|
||||||
|
<div className="deps-loading">Loading dependencies...</div>
|
||||||
|
) : depsError ? (
|
||||||
|
<div className="deps-error">{depsError}</div>
|
||||||
|
) : dependencies.length === 0 ? (
|
||||||
|
<div className="deps-empty">
|
||||||
|
{selectedTag ? (
|
||||||
|
<span><strong>{selectedTag.name}</strong> has no dependencies</span>
|
||||||
|
) : (
|
||||||
|
<span>No dependencies</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="deps-list">
|
||||||
|
<div className="deps-summary">
|
||||||
|
<strong>{selectedTag?.name}</strong> has {dependencies.length} {dependencies.length === 1 ? 'dependency' : 'dependencies'}:
|
||||||
|
</div>
|
||||||
|
<ul className="deps-items">
|
||||||
|
{dependencies.map((dep) => (
|
||||||
|
<li key={dep.id} className="dep-item">
|
||||||
|
<Link
|
||||||
|
to={`/project/${dep.project}/${dep.package}`}
|
||||||
|
className="dep-link"
|
||||||
|
>
|
||||||
|
{dep.project}/{dep.package}
|
||||||
|
</Link>
|
||||||
|
<span className="dep-constraint">
|
||||||
|
@ {dep.version || dep.tag}
|
||||||
|
</span>
|
||||||
|
<span className="dep-status dep-status--ok" title="Package exists">
|
||||||
|
✓
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Used By (Reverse Dependencies) Section */}
|
{/* Used By (Reverse Dependencies) Section */}
|
||||||
<div className="used-by-section card">
|
<div className="used-by-section card">
|
||||||
<h3>Used By</h3>
|
<h3>Used By</h3>
|
||||||
@@ -746,6 +737,78 @@ function PackagePage() {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="download-by-id-section card">
|
||||||
|
<h3>Download by Artifact ID</h3>
|
||||||
|
<div className="download-by-id-form">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={artifactIdInput}
|
||||||
|
onChange={(e) => setArtifactIdInput(e.target.value.toLowerCase().replace(/[^a-f0-9]/g, '').slice(0, 64))}
|
||||||
|
placeholder="Enter SHA256 artifact ID (64 hex characters)"
|
||||||
|
className="artifact-id-input"
|
||||||
|
/>
|
||||||
|
<a
|
||||||
|
href={artifactIdInput.length === 64 ? getDownloadUrl(projectName!, packageName!, `artifact:${artifactIdInput}`) : '#'}
|
||||||
|
className={`btn btn-primary ${artifactIdInput.length !== 64 ? 'btn-disabled' : ''}`}
|
||||||
|
download
|
||||||
|
onClick={(e) => {
|
||||||
|
if (artifactIdInput.length !== 64) {
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Download
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
{artifactIdInput.length > 0 && artifactIdInput.length !== 64 && (
|
||||||
|
<p className="validation-hint">Artifact ID must be exactly 64 hex characters ({artifactIdInput.length}/64)</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{user && canWrite && (
|
||||||
|
<div className="create-tag-section card">
|
||||||
|
<h3>Create / Update Tag</h3>
|
||||||
|
<p className="section-description">Point a tag at any existing artifact by its ID</p>
|
||||||
|
<form onSubmit={handleCreateTag} className="create-tag-form">
|
||||||
|
<div className="form-row">
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="create-tag-name">Tag Name</label>
|
||||||
|
<input
|
||||||
|
id="create-tag-name"
|
||||||
|
type="text"
|
||||||
|
value={createTagName}
|
||||||
|
onChange={(e) => setCreateTagName(e.target.value)}
|
||||||
|
placeholder="latest, stable, v1.0.0..."
|
||||||
|
disabled={createTagLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-group form-group--wide">
|
||||||
|
<label htmlFor="create-tag-artifact">Artifact ID</label>
|
||||||
|
<input
|
||||||
|
id="create-tag-artifact"
|
||||||
|
type="text"
|
||||||
|
value={createTagArtifactId}
|
||||||
|
onChange={(e) => setCreateTagArtifactId(e.target.value.toLowerCase().replace(/[^a-f0-9]/g, '').slice(0, 64))}
|
||||||
|
placeholder="SHA256 hash (64 hex characters)"
|
||||||
|
className="artifact-id-input"
|
||||||
|
disabled={createTagLoading}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
className="btn btn-primary"
|
||||||
|
disabled={createTagLoading || !createTagName.trim() || createTagArtifactId.length !== 64}
|
||||||
|
>
|
||||||
|
{createTagLoading ? 'Creating...' : 'Create Tag'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{createTagArtifactId.length > 0 && createTagArtifactId.length !== 64 && (
|
||||||
|
<p className="validation-hint">Artifact ID must be exactly 64 hex characters ({createTagArtifactId.length}/64)</p>
|
||||||
|
)}
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="usage-section card">
|
<div className="usage-section card">
|
||||||
<h3>Usage</h3>
|
<h3>Usage</h3>
|
||||||
<p>Download artifacts using:</p>
|
<p>Download artifacts using:</p>
|
||||||
@@ -768,118 +831,6 @@ function PackagePage() {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Upload Modal */}
|
|
||||||
{showUploadModal && (
|
|
||||||
<div className="modal-overlay" onClick={() => setShowUploadModal(false)}>
|
|
||||||
<div className="upload-modal" onClick={(e) => e.stopPropagation()}>
|
|
||||||
<div className="modal-header">
|
|
||||||
<h3>Upload Artifact</h3>
|
|
||||||
<button
|
|
||||||
className="modal-close"
|
|
||||||
onClick={() => setShowUploadModal(false)}
|
|
||||||
title="Close"
|
|
||||||
>
|
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<line x1="18" y1="6" x2="6" y2="18"></line>
|
|
||||||
<line x1="6" y1="6" x2="18" y2="18"></line>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="modal-body">
|
|
||||||
<div className="form-group">
|
|
||||||
<label htmlFor="upload-tag">Tag (optional)</label>
|
|
||||||
<input
|
|
||||||
id="upload-tag"
|
|
||||||
type="text"
|
|
||||||
value={uploadTag}
|
|
||||||
onChange={(e) => setUploadTag(e.target.value)}
|
|
||||||
placeholder="v1.0.0, latest, stable..."
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<DragDropUpload
|
|
||||||
projectName={projectName!}
|
|
||||||
packageName={packageName!}
|
|
||||||
tag={uploadTag || undefined}
|
|
||||||
onUploadComplete={(result) => {
|
|
||||||
handleUploadComplete(result);
|
|
||||||
setShowUploadModal(false);
|
|
||||||
setUploadTag('');
|
|
||||||
}}
|
|
||||||
onUploadError={handleUploadError}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Create/Update Tag Modal */}
|
|
||||||
{showCreateTagModal && (
|
|
||||||
<div className="modal-overlay" onClick={() => setShowCreateTagModal(false)}>
|
|
||||||
<div className="create-tag-modal" onClick={(e) => e.stopPropagation()}>
|
|
||||||
<div className="modal-header">
|
|
||||||
<h3>Create / Update Tag</h3>
|
|
||||||
<button
|
|
||||||
className="modal-close"
|
|
||||||
onClick={() => { setShowCreateTagModal(false); setCreateTagName(''); setCreateTagArtifactId(''); }}
|
|
||||||
title="Close"
|
|
||||||
>
|
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<line x1="18" y1="6" x2="6" y2="18"></line>
|
|
||||||
<line x1="6" y1="6" x2="18" y2="18"></line>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="modal-body">
|
|
||||||
<p className="modal-description">Point a tag at an artifact by its ID</p>
|
|
||||||
<form onSubmit={(e) => { handleCreateTag(e); setShowCreateTagModal(false); }}>
|
|
||||||
<div className="form-group">
|
|
||||||
<label htmlFor="modal-tag-name">Tag Name</label>
|
|
||||||
<input
|
|
||||||
id="modal-tag-name"
|
|
||||||
type="text"
|
|
||||||
value={createTagName}
|
|
||||||
onChange={(e) => setCreateTagName(e.target.value)}
|
|
||||||
placeholder="latest, stable, v1.0.0..."
|
|
||||||
disabled={createTagLoading}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="form-group">
|
|
||||||
<label htmlFor="modal-artifact-id">Artifact ID</label>
|
|
||||||
<input
|
|
||||||
id="modal-artifact-id"
|
|
||||||
type="text"
|
|
||||||
value={createTagArtifactId}
|
|
||||||
onChange={(e) => setCreateTagArtifactId(e.target.value.toLowerCase().replace(/[^a-f0-9]/g, '').slice(0, 64))}
|
|
||||||
placeholder="SHA256 hash (64 hex characters)"
|
|
||||||
className="artifact-id-input"
|
|
||||||
disabled={createTagLoading}
|
|
||||||
/>
|
|
||||||
{createTagArtifactId.length > 0 && createTagArtifactId.length !== 64 && (
|
|
||||||
<p className="validation-hint">{createTagArtifactId.length}/64 characters</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="modal-actions">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="btn btn-secondary"
|
|
||||||
onClick={() => { setShowCreateTagModal(false); setCreateTagName(''); setCreateTagArtifactId(''); }}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="submit"
|
|
||||||
className="btn btn-primary"
|
|
||||||
disabled={createTagLoading || !createTagName.trim() || createTagArtifactId.length !== 64}
|
|
||||||
>
|
|
||||||
{createTagLoading ? 'Creating...' : 'Create Tag'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Ensure File Modal */}
|
{/* Ensure File Modal */}
|
||||||
{showEnsureFile && (
|
{showEnsureFile && (
|
||||||
<div className="modal-overlay" onClick={() => setShowEnsureFile(false)}>
|
<div className="modal-overlay" onClick={() => setShowEnsureFile(false)}>
|
||||||
@@ -921,107 +872,6 @@ function PackagePage() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Dependencies Modal */}
|
|
||||||
{showDepsModal && selectedTag && (
|
|
||||||
<div className="modal-overlay" onClick={() => setShowDepsModal(false)}>
|
|
||||||
<div className="deps-modal" onClick={(e) => e.stopPropagation()}>
|
|
||||||
<div className="modal-header">
|
|
||||||
<h3>Dependencies for {selectedTag.version || selectedTag.name}</h3>
|
|
||||||
<button
|
|
||||||
className="modal-close"
|
|
||||||
onClick={() => setShowDepsModal(false)}
|
|
||||||
title="Close"
|
|
||||||
>
|
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<line x1="18" y1="6" x2="6" y2="18"></line>
|
|
||||||
<line x1="6" y1="6" x2="18" y2="18"></line>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="modal-body">
|
|
||||||
<div className="deps-modal-controls">
|
|
||||||
<button
|
|
||||||
className="btn btn-secondary btn-small"
|
|
||||||
onClick={fetchEnsureFile}
|
|
||||||
disabled={ensureFileLoading}
|
|
||||||
>
|
|
||||||
View Ensure File
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
className="btn btn-secondary btn-small"
|
|
||||||
onClick={() => { setShowDepsModal(false); setShowGraph(true); }}
|
|
||||||
>
|
|
||||||
View Graph
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{depsLoading ? (
|
|
||||||
<div className="deps-loading">Loading dependencies...</div>
|
|
||||||
) : depsError ? (
|
|
||||||
<div className="deps-error">{depsError}</div>
|
|
||||||
) : dependencies.length === 0 ? (
|
|
||||||
<div className="deps-empty">No dependencies</div>
|
|
||||||
) : (
|
|
||||||
<div className="deps-list">
|
|
||||||
<div className="deps-summary">
|
|
||||||
{dependencies.length} {dependencies.length === 1 ? 'dependency' : 'dependencies'}:
|
|
||||||
</div>
|
|
||||||
<ul className="deps-items">
|
|
||||||
{dependencies.map((dep) => (
|
|
||||||
<li key={dep.id} className="dep-item">
|
|
||||||
<Link
|
|
||||||
to={`/project/${dep.project}/${dep.package}`}
|
|
||||||
className="dep-link"
|
|
||||||
onClick={() => setShowDepsModal(false)}
|
|
||||||
>
|
|
||||||
{dep.project}/{dep.package}
|
|
||||||
</Link>
|
|
||||||
<span className="dep-constraint">
|
|
||||||
@ {dep.version || dep.tag}
|
|
||||||
</span>
|
|
||||||
<span className="dep-status dep-status--ok" title="Package exists">
|
|
||||||
✓
|
|
||||||
</span>
|
|
||||||
</li>
|
|
||||||
))}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Artifact ID Modal */}
|
|
||||||
{showArtifactIdModal && viewArtifactId && (
|
|
||||||
<div className="modal-overlay" onClick={() => setShowArtifactIdModal(false)}>
|
|
||||||
<div className="artifact-id-modal" onClick={(e) => e.stopPropagation()}>
|
|
||||||
<div className="modal-header">
|
|
||||||
<h3>Artifact ID</h3>
|
|
||||||
<button
|
|
||||||
className="modal-close"
|
|
||||||
onClick={() => setShowArtifactIdModal(false)}
|
|
||||||
title="Close"
|
|
||||||
>
|
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
|
|
||||||
<line x1="18" y1="6" x2="6" y2="18"></line>
|
|
||||||
<line x1="6" y1="6" x2="18" y2="18"></line>
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div className="modal-body">
|
|
||||||
<p className="modal-description">SHA256 hash identifying this artifact:</p>
|
|
||||||
<div className="artifact-id-display">
|
|
||||||
<code>{viewArtifactId}</code>
|
|
||||||
<CopyButton text={viewArtifactId} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Action Menu Dropdown */}
|
|
||||||
{renderActionMenu()}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -214,7 +214,7 @@ function ProjectPage() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="page-header__actions">
|
<div className="page-header__actions">
|
||||||
{canAdmin && !project.team_id && !project.is_system && (
|
{canAdmin && !project.team_id && (
|
||||||
<button
|
<button
|
||||||
className="btn btn-secondary"
|
className="btn btn-secondary"
|
||||||
onClick={() => navigate(`/project/${projectName}/settings`)}
|
onClick={() => navigate(`/project/${projectName}/settings`)}
|
||||||
@@ -227,11 +227,11 @@ function ProjectPage() {
|
|||||||
Settings
|
Settings
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{canWrite && !project.is_system ? (
|
{canWrite ? (
|
||||||
<button className="btn btn-primary" onClick={() => setShowForm(!showForm)}>
|
<button className="btn btn-primary" onClick={() => setShowForm(!showForm)}>
|
||||||
{showForm ? 'Cancel' : '+ New Package'}
|
{showForm ? 'Cancel' : '+ New Package'}
|
||||||
</button>
|
</button>
|
||||||
) : user && !project.is_system ? (
|
) : user ? (
|
||||||
<span className="text-muted" title="You have read-only access to this project">
|
<span className="text-muted" title="You have read-only access to this project">
|
||||||
Read-only access
|
Read-only access
|
||||||
</span>
|
</span>
|
||||||
@@ -294,20 +294,18 @@ function ProjectPage() {
|
|||||||
placeholder="Filter packages..."
|
placeholder="Filter packages..."
|
||||||
className="list-controls__search"
|
className="list-controls__search"
|
||||||
/>
|
/>
|
||||||
{!project?.is_system && (
|
<select
|
||||||
<select
|
className="list-controls__select"
|
||||||
className="list-controls__select"
|
value={format}
|
||||||
value={format}
|
onChange={(e) => handleFormatChange(e.target.value)}
|
||||||
onChange={(e) => handleFormatChange(e.target.value)}
|
>
|
||||||
>
|
<option value="">All formats</option>
|
||||||
<option value="">All formats</option>
|
{FORMAT_OPTIONS.map((f) => (
|
||||||
{FORMAT_OPTIONS.map((f) => (
|
<option key={f} value={f}>
|
||||||
<option key={f} value={f}>
|
{f}
|
||||||
{f}
|
</option>
|
||||||
</option>
|
))}
|
||||||
))}
|
</select>
|
||||||
</select>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{hasActiveFilters && (
|
{hasActiveFilters && (
|
||||||
@@ -343,19 +341,19 @@ function ProjectPage() {
|
|||||||
className: 'cell-description',
|
className: 'cell-description',
|
||||||
render: (pkg) => pkg.description || '—',
|
render: (pkg) => pkg.description || '—',
|
||||||
},
|
},
|
||||||
...(!project?.is_system ? [{
|
{
|
||||||
key: 'format',
|
key: 'format',
|
||||||
header: 'Format',
|
header: 'Format',
|
||||||
render: (pkg: Package) => <Badge variant="default">{pkg.format}</Badge>,
|
render: (pkg) => <Badge variant="default">{pkg.format}</Badge>,
|
||||||
}] : []),
|
},
|
||||||
...(!project?.is_system ? [{
|
{
|
||||||
key: 'tag_count',
|
key: 'tag_count',
|
||||||
header: 'Tags',
|
header: 'Tags',
|
||||||
render: (pkg: Package) => pkg.tag_count ?? '—',
|
render: (pkg) => pkg.tag_count ?? '—',
|
||||||
}] : []),
|
},
|
||||||
{
|
{
|
||||||
key: 'artifact_count',
|
key: 'artifact_count',
|
||||||
header: project?.is_system ? 'Versions' : 'Artifacts',
|
header: 'Artifacts',
|
||||||
render: (pkg) => pkg.artifact_count ?? '—',
|
render: (pkg) => pkg.artifact_count ?? '—',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -364,12 +362,12 @@ function ProjectPage() {
|
|||||||
render: (pkg) =>
|
render: (pkg) =>
|
||||||
pkg.total_size !== undefined && pkg.total_size > 0 ? formatBytes(pkg.total_size) : '—',
|
pkg.total_size !== undefined && pkg.total_size > 0 ? formatBytes(pkg.total_size) : '—',
|
||||||
},
|
},
|
||||||
...(!project?.is_system ? [{
|
{
|
||||||
key: 'latest_tag',
|
key: 'latest_tag',
|
||||||
header: 'Latest',
|
header: 'Latest',
|
||||||
render: (pkg: Package) =>
|
render: (pkg) =>
|
||||||
pkg.latest_tag ? <strong style={{ color: 'var(--accent-primary)' }}>{pkg.latest_tag}</strong> : '—',
|
pkg.latest_tag ? <strong style={{ color: 'var(--accent-primary)' }}>{pkg.latest_tag}</strong> : '—',
|
||||||
}] : []),
|
},
|
||||||
{
|
{
|
||||||
key: 'created_at',
|
key: 'created_at',
|
||||||
header: 'Created',
|
header: 'Created',
|
||||||
|
|||||||
Reference in New Issue
Block a user