kleinkram 0.52.0.dev20251010062623__py3-none-any.whl → 0.52.0.dev20251015122123__py3-none-any.whl

kleinkram/api/deser.py

@@ -54,6 +54,8 @@ class MissionObjectKeys(str, Enum):
     CREATED_AT = "createdAt"
     UPDATED_AT = "updatedAt"
     TAGS = "tags"
+    FILESIZE = "size"
+    FILECOUNT = "filesCount"
 
 
 class ProjectObjectKeys(str, Enum):
@@ -135,6 +137,8 @@ def _parse_mission(mission: MissionObject) -> Mission:
         created_at = _parse_datetime(mission[MissionObjectKeys.CREATED_AT])
         updated_at = _parse_datetime(mission[MissionObjectKeys.UPDATED_AT])
         metadata = _parse_metadata(mission[MissionObjectKeys.TAGS])
+        file_count = mission[MissionObjectKeys.FILECOUNT]
+        filesize = mission[MissionObjectKeys.FILESIZE]
 
         project_id, project_name = _get_nested_info(mission, PROJECT)
 
@@ -146,6 +150,8 @@ def _parse_mission(mission: MissionObject) -> Mission:
             metadata=metadata,
             project_id=project_id,
             project_name=project_name,
+            number_of_files=file_count,
+            size=filesize,
         )
     except Exception as e:
         raise ParsingError(f"error parsing mission: {mission}") from e

kleinkram/api/routes.py

@@ -43,6 +43,7 @@ from kleinkram.errors import MissionNotFound
 from kleinkram.errors import MissionValidationError
 from kleinkram.errors import ProjectExists
 from kleinkram.errors import ProjectNotFound
+from kleinkram.errors import ProjectValidationError
 from kleinkram.models import File
 from kleinkram.models import Mission
 from kleinkram.models import Project
@@ -256,7 +257,7 @@ def _validate_mission_name(
 def _project_name_is_available(client: AuthenticatedClient, project_name: str) -> bool:
     project_query = ProjectQuery(patterns=[project_name])
     try:
-        _ = get_project(client, project_query)
+        _ = get_project(client, project_query, exact_match=True)
     except ProjectNotFound:
         return True
     return False
@@ -350,10 +351,8 @@ def _create_mission(
 def _create_project(
     client: AuthenticatedClient, project_name: str, description: str
 ) -> UUID:
-    if not _project_name_is_available(client, project_name):
-        raise ProjectExists(f"Project with name: `{project_name}` already exists")
 
-    # TODO: check name and description are valid
+    _validate_project_name(client, project_name, description)
     payload = {"name": project_name, "description": description}
     resp = client.post(CREATE_PROJECT, json=payload)
     resp.raise_for_status()
@@ -361,6 +360,21 @@ def _create_project(
     return UUID(resp.json()["uuid"], version=4)
 
 
+def _validate_project_name(
+    client: AuthenticatedClient, project_name: str, description: str
+) -> None:
+    if not _project_name_is_available(client, project_name):
+        raise ProjectExists(f"Project with name: `{project_name}` already exists")
+
+    if project_name.endswith(" "):
+        raise ProjectValidationError(
+            f"Project name must not end with a tailing whitespace: `{project_name}`"
+        )
+
+    if not description:
+        raise ProjectValidationError("Project description is required")
+
+
 def _validate_tag_value(tag_value, tag_datatype) -> None:
     if tag_datatype == "NUMBER":
         try:

kleinkram/cli/_mission.py

@@ -46,7 +46,7 @@ def create(
     metadata_dct = load_metadata(Path(metadata)) if metadata else {}  # noqa
 
     client = AuthenticatedClient()
-    project = get_project(client, project_query)
+    project = get_project(client, project_query, exact_match=True)
     project_id = project.id
     project_required_tags = project.required_tags
     mission_id = kleinkram.api.routes._create_mission(

kleinkram/cli/_project.py

@@ -73,7 +73,7 @@ def update(
     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.update_project(
         client=client, project_id=project_id, description=description, new_name=new_name
     )

kleinkram/core.py

@@ -107,7 +107,9 @@ 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, exact_match=True
+        )
         project_id = project.id
         project_required_tags = project.required_tags
         mission_name = check_mission_query_is_creatable(query)

kleinkram/errors.py

@@ -52,6 +52,9 @@ class InvalidMissionMetadata(Exception): ...
 class MissionValidationError(Exception): ...
 
 
+class ProjectValidationError(Exception): ...
+
+
 class NotAuthenticated(Exception):
     def __init__(self) -> None:
         super().__init__(LOGIN_MESSAGE)

{kleinkram-0.52.0.dev20251010062623.dist-info → kleinkram-0.52.0.dev20251015122123.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kleinkram
-Version: 0.52.0.dev20251010062623
+Version: 0.52.0.dev20251015122123
 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.52.0.dev20251010062623.dist-info → kleinkram-0.52.0.dev20251015122123.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=N91W_IRw7yH9pR-_wAmaVjcGgiz0xF7QwG20863oOiY,9760
-kleinkram/errors.py,sha256=C0P7Clw-wLIo9v03aRP2B5_2GjctzlinIFIFe7qZ9OQ,1057
+kleinkram/core.py,sha256=t3kUVwGiTlwJQRjvM8NyOIEkCyoH97y5tmtXe5Jge9o,9800
+kleinkram/errors.py,sha256=vb_yv7dKyx8Osngn3S4_0k40wboGiCyGiuWn4II5TyU,1104
 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=6ar6_WbgvTIkx1rNRzvVP9YNa5BrFD4181q1fml1KwU,5637
+kleinkram/api/deser.py,sha256=pUahCRlPSWBNS-vEMVSTUCzASkabMR2Y4w6jFUC0PVk,5868
 kleinkram/api/file_transfer.py,sha256=Ija34JXaszZR7_hvb08aVzq-DB2KG3ze-qqb7zjrchQ,19985
 kleinkram/api/pagination.py,sha256=VqjIPMzcD2FY3yeBmP76S7vprUGnuFfTLOzbskqnl0U,1511
 kleinkram/api/query.py,sha256=9Exi4hJR7Ml38_zjAcOvSEoIAxZLlpM6QwwzO9fs5Gk,3293
-kleinkram/api/routes.py,sha256=buWu4BKdAF1Tk3fmT-MiuG_otJ2Sv4lIcEVE9cZ8isg,15264
+kleinkram/api/routes.py,sha256=8UShj36X6hUSJ5Ud8u6rInptc_P-an1XGAReEFbkfRI,15723
 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=tvVwcNaBYKZhIh6KjPcdyyTmaep6y-GvG_sV7O49Ov0,3416
+kleinkram/cli/_mission.py,sha256=cXtBaL2w5p4B7xxwuvOa-eqnzLNC1FZMbnNuO87VlLE,5863
+kleinkram/cli/_project.py,sha256=FDF-FH26nTZf4Y_7DZoFsRnybQr4W6LNAppXqWdAZ1c,3434
 kleinkram/cli/_upload.py,sha256=EFxbf4SNLuse_lPt0EIpfQLB-1pw7-oHNLdjxLrdMYE,3491
 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.52.0.dev20251010062623.dist-info/METADATA,sha256=nUeOO2IRhaAaKUSfzlsxutXKax3AjdnWub8NQMVo6NU,2846
-kleinkram-0.52.0.dev20251010062623.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kleinkram-0.52.0.dev20251010062623.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.52.0.dev20251010062623.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.52.0.dev20251010062623.dist-info/RECORD,,
+kleinkram-0.52.0.dev20251015122123.dist-info/METADATA,sha256=ced216npmVeMIUao-BioYUIxvPrvNHHT25eWMxmY_04,2846
+kleinkram-0.52.0.dev20251015122123.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kleinkram-0.52.0.dev20251015122123.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.52.0.dev20251015122123.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.52.0.dev20251015122123.dist-info/RECORD,,