labtasker-server 2.0.0__tar.gz → 2.0.1__tar.gz

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labtasker-server
-Version: 2.0.0
+Version: 2.0.1
 Summary: SQLite/FastAPI server for parallel model inference and evaluation
 Project-URL: Homepage, https://github.com/luocfprime/labtasker
 Project-URL: Repository, https://github.com/luocfprime/labtasker.git

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "labtasker-server"
-version = "2.0.0"
+version = "2.0.1"
 description = "SQLite/FastAPI server for parallel model inference and evaluation"
 requires-python = ">=3.11"
 license = "Apache-2.0"

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/src/labtasker_server/__init__.py

@@ -1,3 +1,3 @@
 """Labtasker v2 HTTP server package."""
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/src/labtasker_server/app.py

@@ -142,7 +142,7 @@ def create_app(
             return
         if credentials is None or credentials.scheme.lower() != "bearer":
             raise _unauthorized()
-        if not hmac.compare_digest(credentials.credentials, token):
+        if not hmac.compare_digest(credentials.credentials.encode(), token.encode("ascii")):
             raise _unauthorized()
 
     authenticated = [Depends(require_auth)]

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/src/labtasker_server/cli.py

@@ -75,7 +75,7 @@ def serve(
 
     Examples:
 
-    
+    \b
       labtasker-server serve
       LABTASKER_SERVER_TOKEN=secret labtasker-server serve \\
         --host 0.0.0.0 --database /data/labtasker.db

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/src/labtasker_server/config.py

@@ -14,6 +14,9 @@ class ServerSettings:
     token: str | None = None
     database_fd: int | None = None
 
+    def __post_init__(self) -> None:
+        _validate_token(self.token)
+
     @classmethod
     def from_values(
         cls,
@@ -24,8 +27,6 @@ class ServerSettings:
         token: str | None = None,
     ) -> ServerSettings:
         effective_token = os.environ.get("LABTASKER_SERVER_TOKEN") if token is None else token
-        if effective_token == "":
-            raise ValueError("LABTASKER_SERVER_TOKEN must not be empty.")
         if not 1 <= port <= 65535:
             raise ValueError("port must be between 1 and 65535.")
         if effective_token is None and not _is_tokenless_host_allowed(host):
@@ -33,6 +34,15 @@ class ServerSettings:
         return cls(host=host, port=port, database=Path(database), token=effective_token)
 
 
+def _validate_token(token: str | None) -> None:
+    if token is not None and not isinstance(token, str):
+        raise ValueError("LABTASKER_SERVER_TOKEN must be a string.")
+    if token == "":
+        raise ValueError("LABTASKER_SERVER_TOKEN must not be empty.")
+    if token is not None and any(not 0x21 <= ord(character) <= 0x7E for character in token):
+        raise ValueError("LABTASKER_SERVER_TOKEN must contain only visible ASCII characters.")
+
+
 def _is_tokenless_host_allowed(host: str) -> bool:
     if host.lower() == "localhost":
         return True

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/src/labtasker_server/filtering.py

@@ -445,17 +445,21 @@ def _compile_membership(node: Membership) -> ColumnElement[bool]:
             raise _invalid_filter("Use a scalar literal on the left to test route membership.")
         if runtime.kind == "fixed" or runtime.declared_type is not None:
             normalized = [_normalize_declared_literal(runtime, value) for value in node.values]
-            matches = (
-                or_(*[_declared_comparison(runtime, "==", value) for value in normalized])
-                if normalized
-                else false()
-            )
+            if runtime.kind == "fixed":
+                candidates = _unique_scalars([value for value in normalized if value is not None])
+                fixed_matches: list[ColumnElement[bool]] = []
+                if any(value is None for value in normalized):
+                    fixed_matches.append(runtime.value.is_(None))
+                if candidates:
+                    fixed_matches.append(
+                        and_(runtime.value.is_not(None), runtime.value.in_(candidates))
+                    )
+                matches = or_(*fixed_matches) if fixed_matches else false()
+            else:
+                matches = _json_in(runtime.value, runtime.json_type, normalized)
             present = true() if runtime.kind == "fixed" else runtime.json_type.is_not(None)
         else:
-            comparisons = [
-                _json_equal(runtime.value, runtime.json_type, value) for value in node.values
-            ]
-            matches = or_(*comparisons) if comparisons else false()
+            matches = _json_in(runtime.value, runtime.json_type, list(node.values))
             present = runtime.json_type.in_(["null", "true", "false", "integer", "real", "text"])
         return and_(present, not_(matches) if node.operator == "not in" else matches)
 
@@ -499,17 +503,50 @@ def _json_equal(value_expression: Any, type_expression: Any, value: Scalar) -> C
     return and_(type_expression == "text", value_expression == value)
 
 
+def _json_in(
+    value_expression: Any,
+    type_expression: Any,
+    values: list[Scalar | int],
+) -> ColumnElement[bool]:
+    matches: list[ColumnElement[bool]] = []
+    if any(value is None for value in values):
+        matches.append(type_expression == "null")
+    if any(value is True for value in values):
+        matches.append(type_expression == "true")
+    if any(value is False for value in values):
+        matches.append(type_expression == "false")
+    numbers = _unique_scalars(
+        [
+            value
+            for value in values
+            if isinstance(value, (int, float)) and not isinstance(value, bool)
+        ]
+    )
+    if numbers:
+        matches.append(
+            and_(type_expression.in_(["integer", "real"]), value_expression.in_(numbers))
+        )
+    strings = _unique_scalars([value for value in values if isinstance(value, str)])
+    if strings:
+        matches.append(and_(type_expression == "text", value_expression.in_(strings)))
+    return or_(*matches) if matches else false()
+
+
+def _unique_scalars(values: list[Scalar | int]) -> list[Scalar | int]:
+    return list(dict.fromkeys(values))
+
+
 def _timestamp_us(value: str) -> int:
     if not RFC3339_RE.fullmatch(value):
         raise _invalid_filter("Timestamp literal must be a strict RFC 3339 string.")
     normalized = value[:-1] + "+00:00" if value.endswith("Z") else value
     try:
         parsed = datetime.fromisoformat(normalized)
-    except ValueError as error:
+        if parsed.utcoffset() is None:
+            raise _invalid_filter("Timestamp literal must include a UTC offset.")
+        delta = parsed.astimezone(UTC) - datetime(1970, 1, 1, tzinfo=UTC)
+    except (ValueError, OverflowError) as error:
         raise _invalid_filter("Timestamp literal must be a valid RFC 3339 time.") from error
-    if parsed.utcoffset() is None:
-        raise _invalid_filter("Timestamp literal must include a UTC offset.")
-    delta = parsed.astimezone(UTC) - datetime(1970, 1, 1, tzinfo=UTC)
     return (delta.days * 86_400 + delta.seconds) * 1_000_000 + delta.microseconds
 
 

{labtasker_server-2.0.0 → labtasker_server-2.0.1}/src/labtasker_server/local.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import hashlib
 import json
+import math
 import os
 import secrets
 import socket
@@ -209,13 +210,30 @@ def read_metadata(paths: LocalPaths) -> RuntimeMetadata | None:
     except (OSError, ValueError, TypeError, json.JSONDecodeError):
         return None
     if (
-        metadata.metadata_version != METADATA_VERSION
+        not isinstance(metadata.metadata_version, int)
+        or isinstance(metadata.metadata_version, bool)
+        or metadata.metadata_version != METADATA_VERSION
+        or not isinstance(metadata.generation, str)
+        or not metadata.generation
+        or not isinstance(metadata.role, str)
         or metadata.role not in {"coordinator", "daemon"}
+        or not isinstance(metadata.pid, int)
+        or isinstance(metadata.pid, bool)
         or metadata.pid <= 0
-        or not metadata.generation
+        or not isinstance(metadata.process_start_marker, str)
+        or not metadata.process_start_marker
+        or not isinstance(metadata.directory, str)
         or metadata.directory != str(paths.directory)
+        or not isinstance(metadata.database, str)
         or metadata.database != str(paths.database)
+        or not isinstance(metadata.database_device, int)
+        or isinstance(metadata.database_device, bool)
+        or not isinstance(metadata.database_inode, int)
+        or isinstance(metadata.database_inode, bool)
         or not isinstance(metadata.automatic_attempt_at, (int, float))
+        or isinstance(metadata.automatic_attempt_at, bool)
+        or not math.isfinite(metadata.automatic_attempt_at)
+        or not (metadata.server_version is None or isinstance(metadata.server_version, str))
     ):
         return None
     return metadata

labtasker_server-2.0.0/src/labtasker_server/py.typed

@@ -1 +0,0 @@
-