kleinkram 0.38.1.dev20250207122632__py3-none-any.whl → 0.38.1.dev20250218095010__py3-none-any.whl

kleinkram/api/client.py

@@ -1,10 +1,17 @@
 from __future__ import annotations
 
 import logging
+from collections import abc
 from threading import Lock
 from typing import Any
+from typing import List
+from typing import Mapping
+from typing import Sequence
+from typing import Tuple
+from typing import Union
 
 import httpx
+from httpx._types import PrimitiveData
 
 from kleinkram.config import Config
 from kleinkram.config import Credentials
@@ -17,10 +24,41 @@ logger = logging.getLogger(__name__)
 
 COOKIE_AUTH_TOKEN = "authtoken"
 COOKIE_REFRESH_TOKEN = "refreshtoken"
-COOKIE_CLI_KEY = "clikey"
+COOKIE_API_KEY = "clikey"
 
 
-class NotLoggedInException(Exception): ...
+Data = Union[PrimitiveData, Any]
+NestedData = Mapping[str, Data]
+ListData = Sequence[Data]
+QueryParams = Mapping[str, Union[Data, NestedData, ListData]]
+
+
+def _convert_nested_data_query_params_values(
+    key: str, values: NestedData
+) -> List[Tuple[str, Data]]:
+    return [(f"{key}[{k}]", v) for k, v in values.items()]
+
+
+def _convert_list_data_query_params_values(
+    key: str, values: ListData
+) -> List[Tuple[str, Data]]:
+    return [(key, value) for value in values]
+
+
+def _convert_query_params_to_httpx_format(
+    params: QueryParams,
+) -> List[Tuple[str, Data]]:
+    ret: List[Tuple[str, Data]] = []
+    for key, value in params.items():
+        if isinstance(value, (str, int, float, bool)) or value is None:
+            ret.append((key, value))
+        elif isinstance(value, abc.Mapping):
+            ret.extend(_convert_nested_data_query_params_values(key, value))
+        elif isinstance(value, abc.Sequence):
+            ret.extend(_convert_list_data_query_params_values(key, value))
+        else:  # TODO: handle this better
+            ret.append((key, str(value)))
+    return ret
 
 
 class AuthenticatedClient(httpx.Client):
@@ -36,9 +74,9 @@ class AuthenticatedClient(httpx.Client):
         if self._config.credentials is None:
             logger.info("not authenticated...")
             raise NotAuthenticated
-        elif (cli_key := self._config.credentials.cli_key) is not None:
+        elif (api_key := self._config.credentials.api_key) is not None:
             logger.info("using cli key...")
-            self.cookies.set(COOKIE_CLI_KEY, cli_key)
+            self.cookies.set(COOKIE_API_KEY, api_key)
         else:
             logger.info("using refresh token...")
             assert self._config.credentials.auth_token is not None, "unreachable"
@@ -48,7 +86,7 @@ class AuthenticatedClient(httpx.Client):
         if self._config.credentials is None:
             raise NotAuthenticated
 
-        if self._config.credentials.cli_key is not None:
+        if self._config.credentials.api_key is not None:
             raise RuntimeError("cannot refresh token when using cli key auth")
 
         refresh_token = self._config.credentials.refresh_token
@@ -73,7 +111,12 @@ class AuthenticatedClient(httpx.Client):
         self.cookies.set(COOKIE_AUTH_TOKEN, new_access_token)
 
     def request(
-        self, method: str, url: str | httpx.URL, *args: Any, **kwargs: Any
+        self,
+        method: str,
+        url: str | httpx.URL,
+        params: QueryParams | None = None,
+        *args: Any,
+        **kwargs: Any,
     ) -> httpx.Response:
         if isinstance(url, httpx.URL):
             raise NotImplementedError(f"`httpx.URL` is not supported {url!r}")
@@ -83,7 +126,11 @@ class AuthenticatedClient(httpx.Client):
         # try to do a request
         full_url = f"{self._config.endpoint.api}{url}"
         logger.info(f"requesting {method} {full_url}")
-        response = super().request(method, full_url, *args, **kwargs)
+
+        httpx_params = _convert_query_params_to_httpx_format(params or {})
+        response = super().request(
+            method, full_url, params=httpx_params, *args, **kwargs
+        )
 
         logger.info(f"got response {response}")
 

kleinkram/api/file_transfer.py

@@ -32,12 +32,12 @@ from kleinkram.utils import styled_string
 
 logger = logging.getLogger(__name__)
 
-UPLOAD_CREDS = "/file/temporaryAccess"
+UPLOAD_CREDS = "/files/temporaryAccess"
 UPLOAD_CONFIRM = "/queue/confirmUpload"
-UPLOAD_CANCEL = "/file/cancelUpload"
+UPLOAD_CANCEL = "/files/cancelUpload"
 
 DOWNLOAD_CHUNK_SIZE = 1024 * 1024 * 16
-DOWNLOAD_URL = "/file/download"
+DOWNLOAD_URL = "/files/download"
 
 S3_MAX_RETRIES = 60  # same as frontend
 S3_READ_TIMEOUT = 60 * 5  # 5 minutes

kleinkram/api/routes.py

@@ -65,15 +65,15 @@ __all__ = [
 CLAIM_ADMIN = "/user/claimAdmin"
 GET_STATUS = "/user/me"
 
-UPDATE_PROJECT = "/project"
-UPDATE_MISSION = "/mission/tags"  # TODO: just metadata for now
-CREATE_MISSION = "/mission/create"
-CREATE_PROJECT = "/project/create"
+UPDATE_PROJECT = "/projects"
+UPDATE_MISSION = "/missions/tags"  # TODO: just metadata for now
+CREATE_MISSION = "/missions/create"
+CREATE_PROJECT = "/projects"
 
 
-FILE_ENDPOINT = "/file/many"
-MISSION_ENDPOINT = "/mission/many"
-PROJECT_ENDPOINT = "/project/many"
+FILE_ENDPOINT = "/files"
+MISSION_ENDPOINT = "/missions"
+PROJECT_ENDPOINT = "/projects"
 
 TAG_TYPE_BY_NAME = "/tag/filtered"
 
@@ -370,7 +370,7 @@ def _claim_admin(client: AuthenticatedClient) -> None:
     return
 
 
-FILE_DELETE_MANY = "/file/deleteMultiple"
+FILE_DELETE_MANY = "/files/deleteMultiple"
 
 
 def _delete_files(
@@ -384,7 +384,7 @@ def _delete_files(
     resp.raise_for_status()
 
 
-MISSION_DELETE_ONE = "/mission/{}"
+MISSION_DELETE_ONE = "/missions/{}"
 
 
 def _delete_mission(client: AuthenticatedClient, mission_id: UUID) -> None:
@@ -396,7 +396,7 @@ def _delete_mission(client: AuthenticatedClient, mission_id: UUID) -> None:
     resp.raise_for_status()
 
 
-PROJECT_DELETE_ONE = "/project/{}"
+PROJECT_DELETE_ONE = "/projects/{}"
 
 
 def _delete_project(client: AuthenticatedClient, project_id: UUID) -> None:

kleinkram/auth.py

@@ -84,7 +84,7 @@ def login_flow(*, key: Optional[str] = None, headless: bool = False) -> None:
     config = get_config()
     # use cli key login
     if key is not None:
-        config.credentials = Credentials(cli_key=key)
+        config.credentials = Credentials(api_key=key)
         save_config(config)
         return
 

kleinkram/cli/_file.py

@@ -0,0 +1,94 @@
+from __future__ import annotations
+
+from typing import Optional
+
+import typer
+
+import kleinkram.api.routes
+import kleinkram.core
+from kleinkram.api.client import AuthenticatedClient
+from kleinkram.api.query import FileQuery
+from kleinkram.api.query import MissionQuery
+from kleinkram.api.query import ProjectQuery
+from kleinkram.api.routes import get_file
+from kleinkram.config import get_shared_state
+from kleinkram.printing import print_file_info
+from kleinkram.utils import split_args
+
+INFO_HELP = "get information about a file"
+DELETE_HELP = "delete a file"
+
+
+file_typer = typer.Typer(
+    no_args_is_help=True, context_settings={"help_option_names": ["-h", "--help"]}
+)
+
+
+@file_typer.command(help=INFO_HELP)
+def info(
+    project: Optional[str] = typer.Option(
+        None, "--project", "-p", help="project id or name"
+    ),
+    mission: Optional[str] = typer.Option(
+        None, "--mission", "-m", help="mission id or name"
+    ),
+    file: str = typer.Option(..., "--file", "-f", help="file id or name"),
+) -> None:
+    project_ids, project_patterns = split_args([project] if project else [])
+    project_query = ProjectQuery(ids=project_ids, patterns=project_patterns)
+
+    mission_ids, mission_patterns = split_args([mission] if mission else [])
+    mission_query = MissionQuery(
+        ids=mission_ids,
+        patterns=mission_patterns,
+        project_query=project_query,
+    )
+
+    file_ids, file_patterns = split_args([file])
+    file_query = FileQuery(
+        ids=file_ids,
+        patterns=file_patterns,
+        mission_query=mission_query,
+    )
+
+    client = AuthenticatedClient()
+    file_parsed = get_file(client, file_query)
+    print_file_info(file_parsed, pprint=get_shared_state().verbose)
+
+
+@file_typer.command(help=DELETE_HELP)
+def delete(
+    project: Optional[str] = typer.Option(
+        None, "--project", "-p", help="project id or name"
+    ),
+    mission: Optional[str] = typer.Option(
+        None, "--mission", "-m", help="mission id or name"
+    ),
+    file: str = typer.Option(..., "--file", "-f", help="file id or name"),
+    confirm: bool = typer.Option(
+        False, "--confirm", "-y", "--yes", help="confirm deletion"
+    ),
+) -> None:
+    if not confirm:
+        typer.confirm(f"delete {project} {mission}", abort=True)
+
+    project_ids, project_patterns = split_args([project] if project else [])
+    project_query = ProjectQuery(ids=project_ids, patterns=project_patterns)
+
+    mission_ids, mission_patterns = split_args([mission] if mission else [])
+    mission_query = MissionQuery(
+        ids=mission_ids,
+        patterns=mission_patterns,
+        project_query=project_query,
+    )
+
+    file_ids, file_patterns = split_args([file])
+    file_query = FileQuery(
+        ids=file_ids,
+        patterns=file_patterns,
+        mission_query=mission_query,
+    )
+
+    client = AuthenticatedClient()
+    file_parsed = get_file(client, file_query)
+    kleinkram.core.delete_files(client=client, file_ids=[file_parsed.id])

kleinkram/cli/app.py

@@ -21,6 +21,7 @@ from kleinkram.api.routes import _get_api_version
 from kleinkram.auth import login_flow
 from kleinkram.cli._download import download_typer
 from kleinkram.cli._endpoint import endpoint_typer
+from kleinkram.cli._file import file_typer
 from kleinkram.cli._list import list_typer
 from kleinkram.cli._mission import mission_typer
 from kleinkram.cli._project import project_typer
@@ -57,7 +58,7 @@ Kleinkram CLI
 
 The Kleinkram CLI is a command line interface for Kleinkram.
 For a list of available commands, run `klein --help` or visit \
-https://docs.datasets.leggedrobotics.com/usage/cli/cli-getting-started.html \
+https://docs.datasets.leggedrobotics.com/usage/python/getting-started.html \
 for more information.
 """
 
@@ -98,11 +99,14 @@ app = ErrorHandledTyper(
     no_args_is_help=True,
 )
 
+app.add_typer(endpoint_typer, name="endpoint", rich_help_panel=CommandTypes.AUTH)
+
 app.add_typer(download_typer, name="download", rich_help_panel=CommandTypes.CORE)
 app.add_typer(upload_typer, name="upload", rich_help_panel=CommandTypes.CORE)
 app.add_typer(verify_typer, name="verify", rich_help_panel=CommandTypes.CORE)
 app.add_typer(list_typer, name="list", rich_help_panel=CommandTypes.CORE)
-app.add_typer(endpoint_typer, name="endpoint", rich_help_panel=CommandTypes.AUTH)
+
+app.add_typer(file_typer, name="file", rich_help_panel=CommandTypes.CRUD)
 app.add_typer(mission_typer, name="mission", rich_help_panel=CommandTypes.CRUD)
 app.add_typer(project_typer, name="project", rich_help_panel=CommandTypes.CRUD)
 

kleinkram/config.py

@@ -45,7 +45,7 @@ class Endpoint(NamedTuple):
 class Credentials(NamedTuple):
     auth_token: Optional[str] = None
     refresh_token: Optional[str] = None
-    cli_key: Optional[str] = None
+    api_key: Optional[str] = None
 
 
 DEFAULT_LOCAL_API = "http://localhost:3000"
@@ -73,14 +73,58 @@ def get_env() -> Environment:
     return Environment.PROD
 
 
+ACTION_API_KEY = "KLEINKRAM_API_KEY"
+ACTION_API = "KLEINKRAM_API"
+ACTION_S3 = "KLEINKRAM_S3"
+
+
+def _get_endpoint_from_action_env_vars() -> Optional[Endpoint]:
+    api = os.getenv(ACTION_API)
+    s3 = os.getenv(ACTION_S3)
+    if api is None or s3 is None:
+        return None
+    return Endpoint("action", api, s3)
+
+
+def _get_api_key_from_action_env_vars() -> Optional[str]:
+    return os.getenv(ACTION_API_KEY)
+
+
+def _get_default_selected_endpoint() -> Endpoint:
+    env_endpoint = _get_endpoint_from_action_env_vars()
+    if env_endpoint is not None:
+        return env_endpoint
+    return DEFAULT_ENDPOINTS[get_env().value]
+
+
+def _get_default_endpoints() -> Dict[str, Endpoint]:
+    env_endpoint = _get_endpoint_from_action_env_vars()
+
+    default_endpoints = DEFAULT_ENDPOINTS.copy()
+    if env_endpoint is not None:
+        default_endpoints["action"] = env_endpoint
+    return default_endpoints
+
+
+def _get_default_credentials() -> Dict[str, Credentials]:
+    endpoint = _get_default_selected_endpoint()
+
+    api_key = _get_api_key_from_action_env_vars()
+    if api_key is not None:
+        return {endpoint.name: Credentials(api_key=api_key)}
+    return {}
+
+
 @dataclass
 class Config:
     version: str = __version__
-    selected_endpoint: str = field(default_factory=lambda: get_env().value)
-    endpoints: Dict[str, Endpoint] = field(
-        default_factory=lambda: DEFAULT_ENDPOINTS.copy()
+    selected_endpoint: str = field(
+        default_factory=lambda: _get_default_selected_endpoint().name
+    )
+    endpoints: Dict[str, Endpoint] = field(default_factory=_get_default_endpoints)
+    endpoint_credentials: Dict[str, Credentials] = field(
+        default_factory=_get_default_credentials
     )
-    endpoint_credentials: Dict[str, Credentials] = field(default_factory=dict)
 
     @property
     def endpoint(self) -> Endpoint:
@@ -129,11 +173,21 @@ def save_config(config: Config, path: Path = CONFIG_PATH) -> None:
     os.replace(temp_path, path)
 
 
-def _load_config(*, path: Path = CONFIG_PATH) -> Config:
+def _load_config_if_compatible(path: Path) -> Optional[Config]:
     if not path.exists():
-        return Config()
+        return None
     with open(path, "r") as f:
-        return _config_from_dict(json.load(f))
+        try:
+            return _config_from_dict(json.load(f))
+        except Exception:
+            return None
+
+
+def _load_config(*, path: Path = CONFIG_PATH) -> Config:
+    config = _load_config_if_compatible(path)
+    if config is None:
+        return Config()
+    return config
 
 
 LOADED_CONFIGS: Dict[Path, Config] = {}
@@ -166,12 +220,8 @@ def check_config_compatibility(path: Path = CONFIG_PATH) -> bool:
     """
     if not path.exists():
         return True
-    try:
-        _ = _load_config(path=path)
-    except Exception as e:
-        logger.info(f"Error loading config: {e}")
-        return False
-    return True
+    config = _load_config_if_compatible(path)
+    return config is not None
 
 
 def endpoint_table(config: Config) -> Table:

kleinkram/printing.py

@@ -191,6 +191,28 @@ def files_to_table(
     return table
 
 
+def file_info_table(file: File) -> Table:
+    table = Table("k", "v", title=f"file info: {file.name}", show_header=False)
+
+    table.add_row("name", file.name)
+    table.add_row("id", Text(str(file.id), style="green"))
+    table.add_row("project", file.project_name)
+    table.add_row("project id", Text(str(file.project_id), style="green"))
+    table.add_row("mission", file.mission_name)
+    table.add_row("mission id", Text(str(file.mission_id), style="green"))
+    table.add_row("created", str(file.created_at))
+    table.add_row("updated", str(file.updated_at))
+    table.add_row("size", format_bytes(file.size))
+    table.add_row("state", file_state_to_text(file.state))
+    table.add_row("categories", ", ".join(file.categories))
+    table.add_row("topics", ", ".join(file.topics))
+    table.add_row("hash", file.hash)
+    table.add_row("type", file.type_)
+    table.add_row("date", str(file.date))
+
+    return table
+
+
 def mission_info_table(
     mission: Mission, print_metadata: bool = False
 ) -> Tuple[Table, ...]:
@@ -297,6 +319,20 @@ def print_projects(projects: Sequence[Project], *, pprint: bool) -> None:
             print(project.id)
 
 
+def print_file_info(file: File, *, pprint: bool) -> None:
+    """\
+    prints the file info to stdout
+    either using pprint or as a list for piping
+    """
+    if pprint:
+        Console().print(file_info_table(file))
+    else:
+        file_dct = asdict(file)
+        for key in file_dct:
+            file_dct[key] = str(file_dct[key])  # TODO: improve this
+        print(json.dumps(file_dct))
+
+
 def print_mission_info(mission: Mission, *, pprint: bool) -> None:
     """\
     prints the mission info to stdout

{kleinkram-0.38.1.dev20250207122632.dist-info → kleinkram-0.38.1.dev20250218095010.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kleinkram
-Version: 0.38.1.dev20250207122632
+Version: 0.38.1.dev20250218095010
 Summary: give me your bags
 Author: Cyrill Püntener, Dominique Garmier, Johann Schwabe
 Classifier: Programming Language :: Python :: 3
@@ -74,7 +74,7 @@ Instead of downloading files from a specified mission you can download arbitrary
 klein download --dest out *id1* *id2* *id3*
 ```
 
-For more information consult the [documentation](https://docs.datasets.leggedrobotics.com/usage/cli/cli-getting-started.html).
+For more information consult the [documentation](https://docs.datasets.leggedrobotics.com/usage/python/getting-started.html).
 
 ## Development
 
@@ -106,10 +106,15 @@ klein --help
 ```
 
 ### Run Tests
+to run unit tests:
 ```bash
-pytest .
+pytest -m "not slow"
 ```
-or if you want to skip slow tests...
+to run all tests (including e2e and integration tests):
 ```bash
-pytest -m "not slow" .
+pytest
 ```
+For the latter you need to have an instance of the backend running locally.
+See instructions in the root of the repository for this.
+On top of that these tests require particular files to be present in the `cli/data/testing` directory.
+To see the exact files that are required, see `cli/testing/backend_fixtures.py`.

{kleinkram-0.38.1.dev20250207122632.dist-info → kleinkram-0.38.1.dev20250218095010.dist-info}/RECORD

@@ -1,49 +1,50 @@
 kleinkram/__init__.py,sha256=xIJqTJw2kbCGryGlCeAdpmtR1FTxmrW1MklUNQEaj74,1061
 kleinkram/__main__.py,sha256=B9RiZxfO4jpCmWPUHyKJ7_EoZlEG4sPpH-nz7T_YhhQ,125
 kleinkram/_version.py,sha256=QYJyRTcqFcJj4qWYpqs7WcoOP6jxDMqyvxLY-cD6KcE,129
-kleinkram/auth.py,sha256=miNMmUu1XjT9DMNQu8BQoK2ygfUmXrnUV4D0zR156d4,2968
-kleinkram/config.py,sha256=3FuIpq65SL0phetvOJftvG6VOAZ4RjnvLkcFX6pwuDY,5452
+kleinkram/auth.py,sha256=XD_rHOyJmYYfO7QJf3TLYH5qXA22gXGWi7PT3jujlVs,2968
+kleinkram/config.py,sha256=3yCEfoG-me4VKjB5ez5yXc_u2S-391e9-22VL1NMW-E,6819
 kleinkram/core.py,sha256=Q7OYIKPN9K6kxf9Eq7r5XRHPJ3RtT7SBZp_3_CS8yuY,8429
 kleinkram/errors.py,sha256=4mygNxkf6IBgaiRWY95qu0v6z4TAXA3G6CUcXC9FU3s,772
 kleinkram/main.py,sha256=BTE0mZN__xd46wBhFi6iBlK9eGGQvJ1LdUMsbnysLi0,172
 kleinkram/models.py,sha256=8nJlPrKVLSmehspeuQSFV6nUo76JzehUn6KIZYH1xy4,1832
-kleinkram/printing.py,sha256=fgSlfRaGqQ7dNiIZGMvEPxMatmUL3MrCvh2ibrz9b_s,9914
+kleinkram/printing.py,sha256=OLApOtXytGZGzdpQ9Kd-swMrPAjdnvCo5jCpLoa2lIE,11238
 kleinkram/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/types.py,sha256=nfDjj8TB1Jn5vqO0Xg6qhLOuKom9DDhe62BrngqnVGM,185
 kleinkram/utils.py,sha256=6HFqTw7-eqDEjNG_PsVEQNMNK-RWOqPsoiZI5SK8F7Q,6270
 kleinkram/wrappers.py,sha256=4xXU43eNnvMG2sssU330MmTLSSRdurOpnZ-zNGOGmt0,11342
 kleinkram/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kleinkram/api/client.py,sha256=t6pWY29bQi36IhfIy98Ijc-w-3LzcBTJxXprfPIdwJo,3614
+kleinkram/api/client.py,sha256=yFanAc8VkpcyO5rVXIPyGaYHmF8_tBeC0ZMRUx0StWU,5061
 kleinkram/api/deser.py,sha256=-eP0haBAFr-dRWJ1v-P5o_rxA8vOBlZMtAGXW8ItIAk,4870
-kleinkram/api/file_transfer.py,sha256=VbVQh6F7r81207OIx8zwnRGhA6SpXmzBhJQHQgR8tso,12982
+kleinkram/api/file_transfer.py,sha256=3wNlVQdjnRtxOzih5HhCTF18xPbYClFIDxCqbwkLl6c,12985
 kleinkram/api/pagination.py,sha256=P_zPsBKlMWkmAv-YfUNHaGW-XLB_4U8BDMrKyiDFIXk,1370
 kleinkram/api/query.py,sha256=gn5yf-eRB_Bcw2diLjt66yQtorrZMKdj5_oNA_oOhvc,3281
-kleinkram/api/routes.py,sha256=xtNZOwrcjcePSrrx7tY0bCB_i6m9z2Gtd8rvrMfxpnM,12111
+kleinkram/api/routes.py,sha256=q2MhoeGRXFKcQlIwxk9kzdzSiFB-EWdyeXVCqLp6ydw,12099
 kleinkram/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/cli/_download.py,sha256=H4YlXJkZE4Md02nzgrO_i8Hsm4ZIejPsxBEKkcn4KHs,2371
 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=zDFnOozOFckpuREFgIPt1IzG5q3b1bsNxYlWQoHoz5A,5301
 kleinkram/cli/_project.py,sha256=N0C96NC_onCEwTteYp2wgkkwkdJt-1q43LFdqNXfjC8,3398
 kleinkram/cli/_upload.py,sha256=gOhbjbmqhmwW7p6bWlSvI53vLHvBFO9QqD1kdU92I2k,2813
 kleinkram/cli/_verify.py,sha256=0ABVa4U_WzaV36ClR8NsOIG7KAMRlnFmsbtnHhbWVj4,1742
-kleinkram/cli/app.py,sha256=pBPv_rDVer5aCelLLfBBqEofSm0yDB3GOBT6qVkd2vw,6539
+kleinkram/cli/app.py,sha256=pQwyX6Bilg3-GJwkfs5K49KtwnTnl8pzsa7urbR3TMg,6657
 kleinkram/cli/error_handling.py,sha256=wK3tzeKVSrZm-xmiyzGLnGT2E4TRpyxhaak6GWGP7P8,1921
 testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-testing/backend_fixtures.py,sha256=79gB_s9cun3B1KGUA0YFcga5rN-rm_9zTRt1HajxRbI,1590
+testing/backend_fixtures.py,sha256=4m4J51KLpuJsNanAKdivQWNflbmWGfODYJUnH-lBTIs,1570
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=5MLYQOtQoXWl0TRkYntYKNdqpd4hl9m0XTRi5OXanYI,104
-tests/test_config.py,sha256=gfQUjwJb2rfvrNbi7cfkNwLr_DFn4mWMM29l3bunsBk,3269
+tests/test_config.py,sha256=2hyk-CY4D_Q1bLDwcpdEs2tpYeR8zdWxW7VvrckoEVk,5225
 tests/test_core.py,sha256=JbzB05LWmaaP77uXeTOQtCJD2AJT0zO9zhDfcZ3GNH8,5139
-tests/test_end_to_end.py,sha256=kIY62viZk2_d5HGt4GVNTkDjR0f1IkAv9OJ8HSqcBG8,3172
+tests/test_end_to_end.py,sha256=0W5pUES5hek-pXq4NZtpPZqKTORkGCRsDv5_D3rDMjY,3372
 tests/test_error_handling.py,sha256=qPSMKF1qsAHyUME0-krxbIrk38iGKkhAyAah-KwN4NE,1300
 tests/test_fixtures.py,sha256=UlPmGbEsGvrDPsaStGMRjNvrVPGjCqOB0RMfLJq2VRA,1071
 tests/test_printing.py,sha256=qCr04OJVl5ouht9FoeWGKOi8MZXevVV1EDghzV1JaMc,1903
 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.38.1.dev20250207122632.dist-info/METADATA,sha256=iRYZsQuqJldM_lQrNcC3EBuUuut-8VX77uNt9Z-2rR0,2333
-kleinkram-0.38.1.dev20250207122632.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-kleinkram-0.38.1.dev20250207122632.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.38.1.dev20250207122632.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.38.1.dev20250207122632.dist-info/RECORD,,
+kleinkram-0.38.1.dev20250218095010.dist-info/METADATA,sha256=6tpuu8kbIDQtsEvjnHu6GvJzm_0n9_T2imocskUJzq0,2683
+kleinkram-0.38.1.dev20250218095010.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+kleinkram-0.38.1.dev20250218095010.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.38.1.dev20250218095010.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.38.1.dev20250218095010.dist-info/RECORD,,

testing/backend_fixtures.py

@@ -32,10 +32,7 @@ WAIT_BEOFORE_DELETION = 5
 @pytest.fixture(scope="session")
 def project():
     project_name = token_hex(8)
-
-    print("here")
     create_project(project_name, description="This is a test project")
-
     project = list_projects(project_names=[project_name])[0]
 
     yield project

tests/test_config.py

@@ -1,13 +1,19 @@
 from __future__ import annotations
 
+import os
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from unittest import mock
 
 import pytest
 
+from kleinkram.config import ACTION_API
+from kleinkram.config import ACTION_API_KEY
+from kleinkram.config import ACTION_S3
 from kleinkram.config import Config
 from kleinkram.config import Endpoint
 from kleinkram.config import _load_config
+from kleinkram.config import _load_config_if_compatible
 from kleinkram.config import add_endpoint
 from kleinkram.config import check_config_compatibility
 from kleinkram.config import endpoint_table
@@ -17,7 +23,30 @@ from kleinkram.config import get_shared_state
 from kleinkram.config import save_config
 from kleinkram.config import select_endpoint
 
-CONFIG_FILENAME = "kleinkram.json"
+CONFIG_FILENAME = ".kleinkram.json"
+
+
+TEST_API_KEY = "test_key"
+TEST_API = "test_api"
+TEST_S3 = "test_s3"
+
+
+@pytest.fixture()
+def set_api_key_env(monkeypatch):
+    with mock.patch.dict(os.environ, clear=True):
+        envvars = {ACTION_API_KEY: TEST_API_KEY}
+        for k, v in envvars.items():
+            monkeypatch.setenv(k, v)
+        yield  # This is the magical bit which restore the environment after
+
+
+@pytest.fixture()
+def set_endpoint_env(monkeypatch):
+    with mock.patch.dict(os.environ, clear=True):
+        envvars = {ACTION_API: TEST_API, ACTION_S3: TEST_S3}
+        for k, v in envvars.items():
+            monkeypatch.setenv(k, v)
+        yield  # This is the magical bit which restore the environment after
 
 
 @pytest.fixture
@@ -26,15 +55,50 @@ def config_path():
         yield Path(tmpdir) / CONFIG_FILENAME
 
 
+def test_load_config_if_compatible_with_invalid_config(config_path):
+    with open(config_path, "w") as f:
+        f.write("this is not a valid config")
+    assert _load_config_if_compatible(config_path) is None
+
+
 def test_load_config_default(config_path):
     config = _load_config(path=config_path)
 
     assert not config_path.exists()
     assert Config() == config
 
+    assert config.endpoint_credentials == {}
+    assert config.selected_endpoint == get_env().value
+
 
-def test_save_and_load_config(config_path):
+def test_load_default_config_with_env_var_api_key_specified(
+    config_path, set_api_key_env
+):
+    assert set_api_key_env is None
 
+    config = _load_config(path=config_path)
+
+    creds = config.endpoint_credentials[config.selected_endpoint]
+    assert creds.auth_token is None
+    assert creds.refresh_token is None
+    assert creds.api_key == TEST_API_KEY
+
+    assert not config_path.exists()
+
+
+def test_load_default_config_with_env_var_endpoints_specified(
+    config_path, set_endpoint_env
+):
+    assert set_endpoint_env is None
+    config = _load_config(path=config_path)
+
+    assert config.selected_endpoint == "action"
+    assert config.endpoint == Endpoint("action", TEST_API, TEST_S3)
+
+    assert not config_path.exists()
+
+
+def test_save_and_load_config(config_path):
     config = Config(version="foo")
 
     assert not config_path.exists()

tests/test_end_to_end.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import os
 import secrets
 import shutil
+import time
 from pathlib import Path
 
 import pytest
@@ -43,6 +44,8 @@ def run_cmd(command, *, verbose=VERBOSE):
 def test_upload_verify_update_download_mission(project, tmp_path, api):
     assert api
 
+    file_names = list(DATA_PATH.glob("*.bag"))
+
     mission_name = secrets.token_hex(8)
     upload = f"{CLI} upload -p {project.name} -m {mission_name} --create {DATA_PATH.absolute()}/*.bag"
     verify = (
@@ -50,12 +53,15 @@ def test_upload_verify_update_download_mission(project, tmp_path, api):
     )
     # update = f"{CLI} mission update -p {project.name} -m {mission_name} --metadata {DATA_PATH.absolute()}/metadata.yaml"
     download = f"{CLI} download -p {project.name} -m {mission_name} --dest {tmp_path.absolute()}"
+    delete_file = f"{CLI} file delete -p {project.name} -m {mission_name} -f {file_names[0].name} -y"
 
     assert run_cmd(upload) == 0
     assert run_cmd(verify) == 0
     # assert run_cmd(update) == 0
     assert run_cmd(download) == 0
 
+    assert run_cmd(delete_file) == 0
+
 
 @pytest.mark.slow
 def test_list_files(project, mission, api):