kleinkram 0.37.0.dev20241118113347__py3-none-any.whl → 0.37.0.dev20241119090040__py3-none-any.whl

kleinkram/api/routes.py

@@ -25,11 +25,11 @@ from kleinkram.models import MissionById
 from kleinkram.models import MissionByName
 from kleinkram.models import Project
 from kleinkram.models import TagType
+from kleinkram.utils import filtered_by_patterns
 from kleinkram.utils import is_valid_uuid4
 
 
-# TODO: change to 10000
-MAX_PAGINATION = 1_000
+MAX_PAGINATION = 10_000
 
 TEMP_CREDS = "/file/temporaryAccess"
 CLAIM_ADMIN = "/user/claimAdmin"
@@ -384,10 +384,16 @@ def get_files_by_file_spec(
         raise ValueError("mission not found")
 
     if spec.files:
+        file_ids = [id for id_ in spec.files if isinstance(id_, UUID)]
+        file_names = filtered_by_patterns(
+            [file.name for file in parsed_mission.files],
+            [name for name in spec.files if isinstance(name, str)],
+        )
+
         filtered = [
-            f
-            for f in parsed_mission.files
-            if f.id in spec.files or f.name in spec.files
+            file
+            for file in parsed_mission.files
+            if file.id in file_ids or file.name in file_names
         ]
         return filtered
 

kleinkram/commands/list.py

@@ -5,16 +5,19 @@ from typing import Optional
 
 import typer
 from kleinkram.api.client import AuthenticatedClient
-from kleinkram.api.routes import get_files
+from kleinkram.api.routes import get_files_by_file_spec
 from kleinkram.api.routes import get_missions
 from kleinkram.api.routes import get_projects
 from kleinkram.config import get_shared_state
 from kleinkram.models import files_to_table
 from kleinkram.models import missions_to_table
 from kleinkram.models import projects_to_table
+from kleinkram.utils import get_valid_file_spec
+from kleinkram.utils import to_name_or_uuid
 from rich.console import Console
 from typer import BadParameter
 
+
 HELP = """\
 List projects, missions, or files.
 """
@@ -37,26 +40,32 @@ def _parse_metadata(raw: List[str]) -> dict:
 
 @list_typer.command()
 def files(
-    project: Optional[str] = typer.Option(None, "--project", "-p", help="project name"),
-    mission: Optional[str] = typer.Option(None, "--mission", "-m", help="mission name"),
-    topics: List[str] = typer.Option(None, "--topics", "-t", help="topics"),
-    metadata: Optional[List[str]] = typer.Argument(None, help="tag=value pairs"),
+    files: Optional[List[str]] = typer.Argument(
+        None, help="file names, ids or patterns"
+    ),
+    project: Optional[str] = typer.Option(
+        None, "--project", "-p", help="project name or id"
+    ),
+    mission: Optional[str] = typer.Option(
+        None, "--mission", "-m", help="mission name or id"
+    ),
 ) -> None:
     client = AuthenticatedClient()
 
-    _topics = topics if topics else None
-    _metadata = _parse_metadata(metadata or [])
+    _files = [to_name_or_uuid(f) for f in files or []]
+    _project = to_name_or_uuid(project) if project else None
+    _mission = to_name_or_uuid(mission) if mission else None
 
-    files = get_files(
-        client, project=project, mission=mission, tags=_metadata, topics=_topics
-    )
+    client = AuthenticatedClient()
+    file_spec = get_valid_file_spec(_files, mission=_mission, project=_project)
+    parsed_files = get_files_by_file_spec(client, file_spec)
 
     if get_shared_state().verbose:
-        table = files_to_table(files)
+        table = files_to_table(parsed_files)
         console = Console()
         console.print(table)
     else:
-        for file in files:
+        for file in parsed_files:
             print(file.id)
 
 

kleinkram/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import base64
-import glob
+import fnmatch
 import hashlib
 import os
 import string
@@ -44,6 +44,14 @@ def check_file_paths(files: Sequence[Path]) -> None:
             )
 
 
+def filtered_by_patterns(names: Sequence[str], patterns: List[str]) -> List[str]:
+    filtered = []
+    for name in names:
+        if any(fnmatch.fnmatch(name, p) for p in patterns):
+            filtered.append(name)
+    return filtered
+
+
 def raw_rich(*objects: Any, **kwargs: Any) -> str:
     """\
     accepts any object that Console.print can print

{kleinkram-0.37.0.dev20241118113347.dist-info → kleinkram-0.37.0.dev20241119090040.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kleinkram
-Version: 0.37.0.dev20241118113347
+Version: 0.37.0.dev20241119090040
 Summary: give me your bags
 Author: Cyrill Püntener, Dominique Garmier, Johann Schwabe
 Classifier: Programming Language :: Python :: 3

{kleinkram-0.37.0.dev20241118113347.dist-info → kleinkram-0.37.0.dev20241119090040.dist-info}/RECORD

@@ -10,24 +10,24 @@ kleinkram/enums.py,sha256=bX0H8_xkh_7DRycJYII8MTjHmjbcFW9ZJ3tzlzRhT2k,149
 kleinkram/errors.py,sha256=bZ92LLweQaorsKZWWsL7BAPxFxODQ01nEeenHOHKrv0,1200
 kleinkram/main.py,sha256=hmFuSnE2p-E4nZ2zDVToOsoELZhosLN0r4wsXnbmsas,168
 kleinkram/models.py,sha256=dOrvK-H6cW8tPbZUbBeE6MROp17c5hp5FeULKZRpZ3s,4329
-kleinkram/utils.py,sha256=72PuaARDOlrxTjh5sHS6llvZng2q78j4IpiUP1RG1qA,5335
+kleinkram/utils.py,sha256=F0SAnA_U9rjjKx0VSpoN_LU7bCv2c0p66mIvzvNnPYk,5577
 kleinkram/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/api/client.py,sha256=b1mUwpu7zrXVTNjTDfW8aA0hgmsisRIlMOqQTSbd7bg,2142
 kleinkram/api/file_transfer.py,sha256=LdXHsFkvNnZrpCYAEi17iQINAHFs4k3FeCrWzThiQJQ,9210
-kleinkram/api/routes.py,sha256=ojAB5Kfnofw6oyeAe_9VS__-YahpWGsiBWl4jjbQO10,12537
+kleinkram/api/routes.py,sha256=pjedtUCvfITumCh-EeTE7-RJzlcFgfRLswGMroF5ejY,12824
 kleinkram/commands/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 kleinkram/commands/download.py,sha256=393n9kaJJJmsAJGdPTrkd-H2giNsJuihr1JD1mdF6rk,3415
 kleinkram/commands/endpoint.py,sha256=VgaleKTev8Muu4OmS4tptbhrbl58u1UTAxEmoLBCQew,1642
-kleinkram/commands/list.py,sha256=QEhD6mSDn_dVc9XI_5HpBrfjG93IowzFxH4rOyVHjCI,2666
+kleinkram/commands/list.py,sha256=bfuzWckZE46Y25EynOxZH0DPIXu_TJEBNFBoLbb4LfM,2926
 kleinkram/commands/mission.py,sha256=BXnGUnOBTSHZipy50P2NtornXUAxDCdyqmGpVUMzfxc,1751
 kleinkram/commands/project.py,sha256=q-kJ1YQr-Axo-Zl0qe2J7eGGgKlSbcdDjpAJIynRLaM,587
 kleinkram/commands/upload.py,sha256=Wc3OkmdtbrloTA4FaE2i1BD2gBcsjkR4T8G9qlIqe-M,4450
 kleinkram/commands/verify.py,sha256=CGndDooBIdnYGPpaaBRNvs-3SWoBUquzAJc-3YB6_Yo,3692
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_utils.py,sha256=1OOimNDLfLU5IWSwCtJRrXLw4SCbEe5rV4Z2XA7wCiU,4611
-kleinkram-0.37.0.dev20241118113347.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-kleinkram-0.37.0.dev20241118113347.dist-info/METADATA,sha256=yx6jAxZ0HbqTl09cmOPiGhh8NRBRlsOt0jF2Dep-fZc,2335
-kleinkram-0.37.0.dev20241118113347.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-kleinkram-0.37.0.dev20241118113347.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.37.0.dev20241118113347.dist-info/top_level.txt,sha256=G1Lj9vHAtZn402Ukkrfll-6BCmnDNy_HVtWeNvXzdDA,16
-kleinkram-0.37.0.dev20241118113347.dist-info/RECORD,,
+tests/test_utils.py,sha256=ob-7lNHP20hnB8E8O242l1IbWqSWvFYqTdYuPAbBoLU,5331
+kleinkram-0.37.0.dev20241119090040.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+kleinkram-0.37.0.dev20241119090040.dist-info/METADATA,sha256=HYyAomahzudM9SZ7vzgH-F_S_jQwOesobHZURUkGW3A,2335
+kleinkram-0.37.0.dev20241119090040.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+kleinkram-0.37.0.dev20241119090040.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.37.0.dev20241119090040.dist-info/top_level.txt,sha256=G1Lj9vHAtZn402Ukkrfll-6BCmnDNy_HVtWeNvXzdDA,16
+kleinkram-0.37.0.dev20241119090040.dist-info/RECORD,,

tests/test_utils.py

@@ -14,6 +14,7 @@ from kleinkram.models import MissionById
 from kleinkram.models import MissionByName
 from kleinkram.utils import b64_md5
 from kleinkram.utils import check_file_paths
+from kleinkram.utils import filtered_by_patterns
 from kleinkram.utils import get_filename
 from kleinkram.utils import get_filename_map
 from kleinkram.utils import get_valid_file_spec
@@ -47,6 +48,25 @@ def test_check_file_paths():
         assert check_file_paths([exists_bag, exits_mcap]) is None
 
 
+@pytest.mark.parametrize(
+    "names, patterns, expected",
+    [
+        pytest.param(["a.bag", "b.mcap"], ["*.bag"], ["a.bag"], id="one pattern"),
+        pytest.param(["a", "b", "c"], ["*"], ["a", "b", "c"], id="match all"),
+        pytest.param(["a", "b", "c"], ["*.bag"], [], id="no match"),
+        pytest.param(
+            ["a.bag", "b.mcap"],
+            ["*.bag", "*.mcap"],
+            ["a.bag", "b.mcap"],
+            id="all match",
+        ),
+        pytest.param(["a", "b", "c"], ["a", "b"], ["a", "b"], id="full name match"),
+    ],
+)
+def test_filtered_by_patterns(names, patterns, expected):
+    assert filtered_by_patterns(names, patterns) == expected
+
+
 def test_is_valid_uuid4():
     valid = "e896313b-2ab0-466b-b458-8911575fdee9"
     invalid = "hello world"