wip: dynamic dependencies

Author: MHajoha

questionpy_common/__init__.py

@@ -2,6 +2,7 @@
 #  QuestionPy is free software released under terms of the MIT license. See LICENSE.md.
 #  (c) Technische Universität Berlin, innoCampus <info@isis.tu-berlin.de>
 from abc import ABC, abstractmethod
+from typing import NamedTuple
 
 from pydantic_core import CoreSchema, core_schema
 
@@ -20,3 +21,13 @@ def __get_pydantic_core_schema__(cls, *_: object) -> CoreSchema:
 
 
 TranslatableString.register(str)
+
+
+class PackageNamespaceAndShortName(NamedTuple):
+    """Tuple of namespace and short name, identifying any version of a specific package."""
+
+    namespace: str
+    short_name: str
+
+    def __str__(self) -> str:
+        return f"@{self.namespace}/{self.short_name}"

questionpy_common/environment.py

@@ -7,10 +7,11 @@
 from enum import Enum
 from functools import total_ordering
 from importlib.resources.abc import Traversable
-from typing import NamedTuple, Protocol
+from typing import Protocol
 
 from pydantic import BaseModel, JsonValue
 
+from questionpy_common import PackageNamespaceAndShortName
 from questionpy_common.api.package import QPyPackageInterface
 from questionpy_common.manifest import Bcp47LanguageTag, Manifest
 
@@ -21,7 +22,6 @@
     "OnRequestCallback",
     "Package",
     "PackageInitFunction",
-    "PackageNamespaceAndShortName",
     "PackageNotInitializedError",
     "PackageNotLoadedError",
     "PackagePermissions",
@@ -79,16 +79,6 @@ def __lt__(self, other: object) -> bool:
         return NotImplemented
 
 
-class PackageNamespaceAndShortName(NamedTuple):
-    """Tuple of namespace and short name, identifying any version of a specific package."""
-
-    namespace: str
-    short_name: str
-
-    def __str__(self) -> str:
-        return f"@{self.namespace}/{self.short_name}"
-
-
 class Package(Protocol):
     @property
     def manifest(self) -> Manifest: ...

questionpy_common/manifest.py

@@ -10,6 +10,7 @@
 from pydantic import AfterValidator, BaseModel, ByteSize, PositiveInt, StringConstraints, conset, field_validator
 from pydantic.fields import Field
 
+from questionpy_common import PackageNamespaceAndShortName
 from questionpy_common.constants import NAME_MAX_LENGTH, RE_API, RE_SEMVER, RE_VALID_CHARS_NAME
 from questionpy_common.version_specifiers import QPyDependencyVersionSpecifier
 
@@ -123,6 +124,10 @@ def ensure_contains_english_translation(
     def identifier(self) -> str:
         return f"@{self.namespace}/{self.short_name}"
 
+    @property
+    def nssn(self) -> PackageNamespaceAndShortName:
+        return PackageNamespaceAndShortName(self.namespace, self.short_name)
+
 
 class PackageFile(BaseModel):
     """Represents a static file included in a built package."""
@@ -153,6 +158,9 @@ class AbstractDynamicQPyDependency(BaseModel, ABC):
     version: QPyDependencyVersionSpecifier | None = None
     include_prereleases: bool = False
 
+    def to_specifier_str(self) -> str:
+        return f"@{self.namespace}/{self.short_name}{" " + str(self.version) if self.version else ""}"
+
 
 class DistDynamicQPyDependency(AbstractDynamicQPyDependency):
     locked: LockedDependencyInfo | None = None

questionpy_server/repository/__init__.py

@@ -13,7 +13,7 @@
 from questionpy_server.repository.models import RepoMeta, RepoPackage, RepoPackageIndex
 from questionpy_server.utils.logger import URLAdapter
 
-_SCHEME_AND_AUTH_PATTERN = re.compile(r"^https?://(?:[^/]+@)?")
+_SCHEME_AND_AUTH_PATTERN = re.compile(r"^https?://(?:[^/@]+@)?")
 _FILENAME_SPECIAL_CHARACTERS_PATTERN = re.compile(r"[/\\?%*:|\"<>,;=\s]+")
 
 def _url_to_safe_path_part(url: str) -> str:

questionpy_server/utils/manifest.py

@@ -25,7 +25,7 @@ class ManifestError(QPyBaseError):
     pass
 
 
-def _read_manifest_sync(package_path: Path) -> ComparableManifest:
+def read_manifest_sync(package_path: Path) -> ComparableManifest:
     try:
         with ZipFile(package_path) as zip_file, zip_file.open(f"{DIST_DIR}/{MANIFEST_FILENAME}") as manifest_file:
             buffer = manifest_file.read(MAX_MANIFEST_SIZE + 1)
@@ -53,4 +53,4 @@ async def read_manifest(package_path: Path) -> ComparableManifest:
     Raises:
         ManifestError: if the manifest could not be read, is too large, or is invalid
     """
-    return await asyncio.to_thread(_read_manifest_sync, package_path)
+    return await asyncio.to_thread(read_manifest_sync, package_path)

questionpy_server/worker/runtime/manager.py

@@ -16,12 +16,12 @@
     Environment,
     OnRequestCallback,
     Package,
-    PackageNamespaceAndShortName,
     PackagePermissions,
     PackageState,
     RequestInfo,
     set_qpy_environment,
 )
+from questionpy_common import PackageNamespaceAndShortName
 from questionpy_common.manifest import PackageType
 from questionpy_server.worker.runtime.connection import WorkerToServerConnection
 from questionpy_server.worker.runtime.messages import (

questionpy_server/worker/runtime/messages.py

@@ -14,7 +14,8 @@
 from questionpy_common.api.qtype import InvalidQuestionStateError, OptionsFormValidationError
 from questionpy_common.api.question import QuestionModel
 from questionpy_common.elements import OptionsFormDefinition
-from questionpy_common.environment import PackageNamespaceAndShortName, PackagePermissions, RequestInfo
+from questionpy_common.environment import PackagePermissions, RequestInfo
+from questionpy_common import PackageNamespaceAndShortName
 from questionpy_common.error import QPyBaseError
 from questionpy_common.manifest import Manifest
 from questionpy_server.worker.runtime.package_location import PackageLocation

questionpy_server/worker/runtime/package.py

@@ -16,11 +16,11 @@
 from questionpy_common.environment import (
     Environment,
     Package,
-    PackageNamespaceAndShortName,
     PackageNotInitializedError,
     PackageNotLoadedError,
     PackageState,
 )
+from questionpy_common import PackageNamespaceAndShortName
 from questionpy_common.manifest import DistStaticQPyDependency, Manifest
 from questionpy_server.worker.runtime.package_location import (
     DirPackageLocation,