kleinkram 0.51.0.dev20251003120233__py3-none-any.whl → 0.51.0.dev20251010055743__py3-none-any.whl

kleinkram/api/deser.py

@@ -4,17 +4,18 @@ from datetime import datetime
 from enum import Enum
 from typing import Any
 from typing import Dict
+from typing import List
 from typing import Literal
 from typing import NewType
 from typing import Tuple
-from typing import List
 from uuid import UUID
 
 import dateutil.parser
 
 from kleinkram.errors import ParsingError
-from kleinkram.models import File, MetadataValue
+from kleinkram.models import File
 from kleinkram.models import FileState
+from kleinkram.models import MetadataValue
 from kleinkram.models import Mission
 from kleinkram.models import Project
 
@@ -85,16 +86,22 @@ def _parse_file_state(state: str) -> FileState:
     except ValueError as e:
         raise ParsingError(f"error parsing file state: {state}") from e
 
+
 def _parse_metadata(tags: List[Dict]) -> Dict[str, MetadataValue]:
     result = {}
     try:
         for tag in tags:
-            entry = {tag.get("name"): MetadataValue(tag.get("valueAsString"), tag.get("datatype"))}
+            entry = {
+                tag.get("name"): MetadataValue(
+                    tag.get("valueAsString"), tag.get("datatype")
+                )
+            }
             result.update(entry)
         return result
     except ValueError as e:
         raise ParsingError(f"error parsing metadata: {e}") from e
 
+
 def _parse_required_tags(tags: List[Dict]) -> list[str]:
     return list(_parse_metadata(tags).keys())
 
@@ -106,7 +113,9 @@ def _parse_project(project_object: ProjectObject) -> Project:
         description = project_object[ProjectObjectKeys.DESCRIPTION]
         created_at = _parse_datetime(project_object[ProjectObjectKeys.CREATED_AT])
         updated_at = _parse_datetime(project_object[ProjectObjectKeys.UPDATED_AT])
-        required_tags = _parse_required_tags(project_object[ProjectObjectKeys.REQUIRED_TAGS])
+        required_tags = _parse_required_tags(
+            project_object[ProjectObjectKeys.REQUIRED_TAGS]
+        )
     except Exception as e:
         raise ParsingError(f"error parsing project: {project_object}") from e
     return Project(

kleinkram/api/pagination.py

@@ -17,6 +17,7 @@ DataPage = Dict[str, Any]
 PAGE_SIZE = 128
 SKIP = "skip"
 TAKE = "take"
+EXACT_MATCH = "exactMatch"
 
 
 def paginated_request(
@@ -25,6 +26,7 @@ def paginated_request(
     params: Optional[Mapping[str, Any]] = None,
     max_entries: Optional[int] = None,
     page_size: int = PAGE_SIZE,
+    exact_match: bool = False,
 ) -> Generator[DataPage, None, None]:
     total_entries_count = 0
 
@@ -32,6 +34,7 @@ def paginated_request(
 
     params[TAKE] = page_size
     params[SKIP] = 0
+    params[EXACT_MATCH] = str(exact_match).lower()  # pass string rather than bool
 
     while True:
         resp = client.get(endpoint, params=params)

kleinkram/api/routes.py

@@ -40,13 +40,14 @@ from kleinkram.errors import InvalidMissionQuery
 from kleinkram.errors import InvalidProjectQuery
 from kleinkram.errors import MissionExists
 from kleinkram.errors import MissionNotFound
+from kleinkram.errors import MissionValidationError
 from kleinkram.errors import ProjectExists
 from kleinkram.errors import ProjectNotFound
-from kleinkram.errors import MissionValidationError
 from kleinkram.models import File
 from kleinkram.models import Mission
 from kleinkram.models import Project
-from kleinkram.utils import is_valid_uuid4, split_args
+from kleinkram.utils import is_valid_uuid4
+from kleinkram.utils import split_args
 
 __all__ = [
     "_get_api_version",
@@ -162,15 +163,22 @@ def get_projects(
     client: AuthenticatedClient,
     project_query: ProjectQuery,
     max_entries: Optional[int] = None,
+    exact_match: bool = False,
 ) -> Generator[Project, None, None]:
     params = _project_query_to_params(project_query)
     response_stream = paginated_request(
-        client, PROJECT_ENDPOINT, params=params, max_entries=max_entries
+        client,
+        PROJECT_ENDPOINT,
+        params=params,
+        max_entries=max_entries,
+        exact_match=exact_match,
     )
     yield from map(lambda p: _parse_project(ProjectObject(p)), response_stream)
 
 
-def get_project(client: AuthenticatedClient, query: ProjectQuery) -> Project:
+def get_project(
+    client: AuthenticatedClient, query: ProjectQuery, exact_match: bool = False
+) -> Project:
     """\
     get a unique project by specifying a project spec
     """
@@ -179,7 +187,7 @@ def get_project(client: AuthenticatedClient, query: ProjectQuery) -> Project:
             f"Project query does not uniquely determine project: {query}"
         )
     try:
-        return next(get_projects(client, query))
+        return next(get_projects(client, query, exact_match=exact_match))
     except StopIteration:
         raise ProjectNotFound(f"Project not found: {query}")
 
@@ -224,7 +232,7 @@ def _mission_name_is_available(
 
 
 def _validate_mission_name(
-        client: AuthenticatedClient, project_id: UUID, mission_name: str
+    client: AuthenticatedClient, project_id: UUID, mission_name: str
 ) -> None:
     if not _mission_name_is_available(client, mission_name, project_id):
         raise MissionExists(
@@ -241,7 +249,7 @@ def _validate_mission_name(
     if mission_name.endswith(" "):
         raise ValueError(
             "A mission name cannot end with a whitespace. "
-            f"The given mission name was \'{mission_name}\'"
+            f"The given mission name was '{mission_name}'"
         )
 
 
@@ -253,7 +261,10 @@ def _project_name_is_available(client: AuthenticatedClient, project_name: str) -
         return True
     return False
 
-def _validate_mission_created(client: AuthenticatedClient, project_id: str, mission_name: str) -> None:
+
+def _validate_mission_created(
+    client: AuthenticatedClient, project_id: str, mission_name: str
+) -> None:
     """
     validate that a mission is successfully created
     """
@@ -350,20 +361,20 @@ def _create_project(
     return UUID(resp.json()["uuid"], version=4)
 
 
-def _validate_tag_value(
-    tag_value, tag_datatype
-) -> None:
+def _validate_tag_value(tag_value, tag_datatype) -> None:
     if tag_datatype == "NUMBER":
         try:
             float(tag_value)
-        except:
+        except ValueError:
             raise InvalidMissionMetadata(f"Value '{tag_value}' is not a valid NUMBER")
     elif tag_datatype == "BOOLEAN":
         if tag_value.lower() not in {"true", "false"}:
-            raise InvalidMissionMetadata(f"Value '{tag_value}' is not a valid BOOLEAN (expected 'true' or 'false')")
+            raise InvalidMissionMetadata(
+                f"Value '{tag_value}' is not a valid BOOLEAN (expected 'true' or 'false')"
+            )
     else:
-        pass # any string is fine
-    #TODO: add check for LOCATION tag datatype
+        pass  # any string is fine
+    # TODO: add check for LOCATION tag datatype
 
 
 def _get_metadata_type_id_by_name(
@@ -376,7 +387,7 @@ def _get_metadata_type_id_by_name(
 
     resp.raise_for_status()
     try:
-        data = resp.json()['data'][0]
+        data = resp.json()["data"][0]
     except IndexError:
         return None, None
 

kleinkram/cli/_project.py

@@ -90,7 +90,7 @@ def delete(
     project_query = ProjectQuery(ids=project_ids, patterns=project_patterns)
 
     client = AuthenticatedClient()
-    project_id = get_project(client=client, query=project_query).id
+    project_id = get_project(client=client, query=project_query, exact_match=True).id
     kleinkram.core.delete_project(client=client, project_id=project_id)
 
 

kleinkram/core.py

@@ -107,9 +107,7 @@ def upload(
 
     if create and mission is None:
         # check if project exists and get its id at the same time
-        project = kleinkram.api.routes.get_project(
-            client, query=query.project_query
-        )
+        project = kleinkram.api.routes.get_project(client, query=query.project_query)
         project_id = project.id
         project_required_tags = project.required_tags
         mission_name = check_mission_query_is_creatable(query)
@@ -284,7 +282,9 @@ def delete_mission(*, client: AuthenticatedClient, mission_id: UUID) -> None:
 
 def delete_project(*, client: AuthenticatedClient, project_id: UUID) -> None:
     pquery = ProjectQuery(ids=[project_id])
-    _ = kleinkram.api.routes.get_project(client, pquery)  # check if project exists
+    _ = kleinkram.api.routes.get_project(
+        client, pquery, exact_match=True
+    )  # check if project exists
 
     # delete all missions and files
     missions = list(

kleinkram/errors.py

@@ -45,6 +45,7 @@ class FileNameNotSupported(Exception): ...
 
 class InvalidMissionMetadata(Exception): ...
 
+
 class MissionValidationError(Exception): ...
 
 

{kleinkram-0.51.0.dev20251003120233.dist-info → kleinkram-0.51.0.dev20251010055743.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kleinkram
-Version: 0.51.0.dev20251003120233
+Version: 0.51.0.dev20251010055743
 Summary: give me your bags
 Author: Cyrill Püntener, Dominique Garmier, Johann Schwabe
 Author-email: pucyril@ethz.ch, dgarmier@ethz.ch, jschwab@ethz.ch

{kleinkram-0.51.0.dev20251003120233.dist-info → kleinkram-0.51.0.dev20251010055743.dist-info}/RECORD

@@ -3,8 +3,8 @@ kleinkram/__main__.py,sha256=B9RiZxfO4jpCmWPUHyKJ7_EoZlEG4sPpH-nz7T_YhhQ,125
 kleinkram/_version.py,sha256=QYJyRTcqFcJj4qWYpqs7WcoOP6jxDMqyvxLY-cD6KcE,129
 kleinkram/auth.py,sha256=PdSYZZO8AauNLZbn9PBgPM3o-O_nwoOKTj94EGnPRE8,3003
 kleinkram/config.py,sha256=nx6uSM5nLP4SKe8b9VAx4KDtCCwtyshXmzbEJcUwpsY,7411
-kleinkram/core.py,sha256=rAMHiH9uwaNcAbVo5NVMl40ArC0Jdp3M9aN2aEBMOCg,9750
-kleinkram/errors.py,sha256=270MC1V-2DDPpER3Dq2F6_aVGDrv4yaYX-oxsqyE1K0,1011
+kleinkram/core.py,sha256=N91W_IRw7yH9pR-_wAmaVjcGgiz0xF7QwG20863oOiY,9760
+kleinkram/errors.py,sha256=WrEOpSwOUr-_waaQ237E6Gm1P5A2OrI55g6Q6iGgkNk,1012
 kleinkram/main.py,sha256=BTE0mZN__xd46wBhFi6iBlK9eGGQvJ1LdUMsbnysLi0,172
 kleinkram/models.py,sha256=0C_TharLDHA4RCe6Plas9N_uO_teN1Z4iP70WljOAfs,1899
 kleinkram/printing.py,sha256=9o4UQq9MYkGwMIlTchbdMLjUROdJWB100Lq1b3OFfko,12280
@@ -14,18 +14,18 @@ kleinkram/utils.py,sha256=AtaTvEQ0TrGaQtZylwniE9l1u7_IRYigLT2bc_jc-lQ,6790
 kleinkram/wrappers.py,sha256=ZScoEov5Q6D2rvaJJ8E-4f58P_NGWrGc9mRPYxSqOC0,13127
 kleinkram/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/api/client.py,sha256=VwuT97_WdbDpcVGwMXB0fRnUoQnUSf7BOP5eXUFokfI,5932
-kleinkram/api/deser.py,sha256=ypAxYi6pTxp6PSNsm9i3oaT1kdri9XxEN0_SnSPzbVw,5517
+kleinkram/api/deser.py,sha256=6ar6_WbgvTIkx1rNRzvVP9YNa5BrFD4181q1fml1KwU,5637
 kleinkram/api/file_transfer.py,sha256=Ija34JXaszZR7_hvb08aVzq-DB2KG3ze-qqb7zjrchQ,19985
-kleinkram/api/pagination.py,sha256=P_zPsBKlMWkmAv-YfUNHaGW-XLB_4U8BDMrKyiDFIXk,1370
+kleinkram/api/pagination.py,sha256=VqjIPMzcD2FY3yeBmP76S7vprUGnuFfTLOzbskqnl0U,1511
 kleinkram/api/query.py,sha256=9Exi4hJR7Ml38_zjAcOvSEoIAxZLlpM6QwwzO9fs5Gk,3293
-kleinkram/api/routes.py,sha256=VKxwaESg-HdUP5urqUYMr52VLpPD9EuhHEWK7CR-skw,15052
+kleinkram/api/routes.py,sha256=buWu4BKdAF1Tk3fmT-MiuG_otJ2Sv4lIcEVE9cZ8isg,15264
 kleinkram/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/cli/_download.py,sha256=e0fDyp_CFOdbKIUGKmtITvAVINa6STYJk5w5QlElXSs,2394
 kleinkram/cli/_endpoint.py,sha256=oY0p4bnuHLEDJCXtTmir4AHswcKAygZ8I4IWC3RFcKc,1796
 kleinkram/cli/_file.py,sha256=Q2fLDdUyfHFmdGC6wIxMqgEl0F76qszhzWJrRV5rTBM,2973
 kleinkram/cli/_list.py,sha256=5gI3aIUeKC0_eWPQqdFXSBBFvpkTTJSm31TamHa197c,3090
 kleinkram/cli/_mission.py,sha256=3ZMPRlPZIvJwmFQqeXu6N8DcmYtSVGj4xWHuAdKAlsc,5845
-kleinkram/cli/_project.py,sha256=N0C96NC_onCEwTteYp2wgkkwkdJt-1q43LFdqNXfjC8,3398
+kleinkram/cli/_project.py,sha256=tvVwcNaBYKZhIh6KjPcdyyTmaep6y-GvG_sV7O49Ov0,3416
 kleinkram/cli/_upload.py,sha256=8gKg_QIFUJh4Sz06EEX3gQoa3Rl41KTdZWqtsntypJU,3531
 kleinkram/cli/_verify.py,sha256=n9QThY0JnqaIqw6udYXdRQGcpUl2lIbFXGQIgpTnDPE,2112
 kleinkram/cli/app.py,sha256=Yetkt2jd6cggor7mPpV9Lcp6aLd45rACdF1nBW0uy9k,7546
@@ -43,8 +43,8 @@ tests/test_printing.py,sha256=kPzpIQOtQJ9yQ32mM8cMGDVOGsbrZZLQhfsXN1Pe68Q,2231
 tests/test_query.py,sha256=fExmCKXLA7-9j2S2sF_sbvRX_2s6Cp3a7OTcqE25q9g,3864
 tests/test_utils.py,sha256=eUBYrn3xrcgcaxm1X4fqZaX4tRvkbI6rh6BUbNbu9T0,4784
 tests/test_wrappers.py,sha256=TbcTyO2L7fslbzgfDdcVZkencxNQ8cGPZm_iB6c9d6Q,2673
-kleinkram-0.51.0.dev20251003120233.dist-info/METADATA,sha256=wl07qC6n8Kv_fKqgQ-15o6dI40ydyUOYRK23ZIYRgcc,2846
-kleinkram-0.51.0.dev20251003120233.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kleinkram-0.51.0.dev20251003120233.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.51.0.dev20251003120233.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.51.0.dev20251003120233.dist-info/RECORD,,
+kleinkram-0.51.0.dev20251010055743.dist-info/METADATA,sha256=09mxfAwJAQrgmlf7ZKFUMMHvxOrvOL-AzWg5CblTCFE,2846
+kleinkram-0.51.0.dev20251010055743.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kleinkram-0.51.0.dev20251010055743.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.51.0.dev20251010055743.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.51.0.dev20251010055743.dist-info/RECORD,,