pyfirecrest 3.2.0__tar.gz → 3.2.2__tar.gz

{pyfirecrest-3.2.0 → pyfirecrest-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyfirecrest
-Version: 3.2.0
+Version: 3.2.2
 Summary: pyFirecrest is a python wrapper for FirecREST
 Author: CSCS Swiss National Supercomputing Center
 Maintainer-email: Eirini Koutsaniti <eirini.koutsaniti@cscs.ch>, Juan Pablo Dorsch <juanpablo.dorsch@cscs.ch>

{pyfirecrest-3.2.0 → pyfirecrest-3.2.2}/firecrest/__init__.py

@@ -7,7 +7,7 @@
 import sys
 
 
-__version__ = "3.2.0"
+__version__ = "3.2.2"
 __app_name__ = "firecrest"
 MIN_PYTHON_VERSION = (3, 7, 0)
 

{pyfirecrest-3.2.0 → pyfirecrest-3.2.2}/firecrest/cli2/__init__.py

@@ -77,6 +77,21 @@ def config_callback(ctx: typer.Context, param: typer.CallbackParam, value: str):
     return value
 
 
+@app.command(rich_help_panel="Status commands")
+def server_version():
+    """Provides the exact version of the FirecREST server, when available."""
+    try:
+        result = client.server_version()
+        if result is None:
+            console.print("[yellow]Server version not available[/yellow]")
+        else:
+            console.print(result)
+
+    except Exception as e:
+        examine_exeption(e)
+        raise typer.Exit(code=1)
+
+
 @app.command(rich_help_panel="Status commands")
 def systems(
     pager: Optional[bool] = typer.Option(
@@ -361,11 +376,17 @@ def cp(
     ),
     source: str = typer.Argument(..., help="The absolute source path."),
     destination: str = typer.Argument(..., help="The absolute destination path."),
+    dereference: bool = typer.Option(
+        False,
+        "-L",
+        "--dereference",
+        help="When copying a symbolic link, copy the file or directory the link points to rather than the link itself.",
+    ),
     account: Optional[str] = typer.Option(None, help="The account to use for the operation."),
 ):
     """Copy files"""
     try:
-        client.cp(system, source, destination, account)
+        client.cp(system, source, destination, dereference=dereference, account=account)
     except Exception as e:
         examine_exeption(e)
         raise typer.Exit(code=1)

{pyfirecrest-3.2.0 → pyfirecrest-3.2.2}/firecrest/v2/_async/Client.py

@@ -448,6 +448,21 @@ class AsyncFirecrest:
 
         return response.json() if return_json and status_code != 204 else {}
 
+    async def server_version(self) -> str | None:
+        """Returns the exact API version of the FirecREST server.
+
+        :calls: GET `/status/systems`
+        """
+        resp = await self._get_request(endpoint="/status/systems")
+        if resp.headers.get("f7t-appversion") == "2.x.x":
+            return "2"
+        elif (
+            resp.headers.get("f7t-appversion")
+        ):
+            return resp.headers["f7t-appversion"]
+        else:
+            return None
+
     async def systems(self) -> List[dict]:
         """Returns available systems.
 
@@ -1014,6 +1029,7 @@ class AsyncFirecrest:
         system_name: str,
         source_path: str,
         target_path: str,
+        dereference: bool = False,
         account: Optional[str] = None,
         blocking: bool = True,
         timeout: Optional[float] = None
@@ -1023,14 +1039,17 @@ class AsyncFirecrest:
         :param system_name: the system name where the filesystem belongs to
         :param source_path: the absolute source path
         :param target_path: the absolute target path
+        :param dereference: dereference links when copying
         :param blocking: whether to wait for the job to complete
         :param account: the account to be used for the transfer job
         :param timeout: the maximum time to wait for the job to complete
         :calls: POST `/filesystem/{system_name}/transfer/cp`
         """
-        data: dict[str, str] = {
+        # TODO: dereference is supported only after version 2.2.8 of the API
+        data: dict[str, Any] = {
             "sourcePath": source_path,
             "targetPath": target_path,
+            "dereference": dereference,
         }
         if account is not None:
             data["account"] = account

{pyfirecrest-3.2.0 → pyfirecrest-3.2.2}/firecrest/v2/_sync/Client.py

@@ -433,6 +433,21 @@ class Firecrest:
 
         return response.json() if return_json and status_code != 204 else {}
 
+    def server_version(self) -> str | None:
+        """Returns the exact API version of the FirecREST server.
+
+        :calls: GET `/status/systems`
+        """
+        resp = self._get_request(endpoint="/status/systems")
+        if resp.headers.get("f7t-appversion") == "2.x.x":
+            return "2"
+        elif (
+            resp.headers.get("f7t-appversion")
+        ):
+            return resp.headers["f7t-appversion"]
+        else:
+            return None
+
     def systems(self) -> List[dict]:
         """Returns available systems.
 
@@ -999,6 +1014,7 @@ class Firecrest:
         system_name: str,
         source_path: str,
         target_path: str,
+        dereference: bool = False,
         account: Optional[str] = None,
         blocking: bool = True,
         timeout: Optional[float] = None
@@ -1008,14 +1024,17 @@ class Firecrest:
         :param system_name: the system name where the filesystem belongs to
         :param source_path: the absolute source path
         :param target_path: the absolute target path
+        :param dereference: dereference links when copying
         :param blocking: whether to wait for the job to complete
         :param account: the account to be used for the transfer job
         :param timeout: the maximum time to wait for the job to complete
         :calls: POST `/filesystem/{system_name}/transfer/cp`
         """
-        data: dict[str, str] = {
+        # TODO: dereference is supported only after version 2.2.8 of the API
+        data: dict[str, Any] = {
             "sourcePath": source_path,
             "targetPath": target_path,
+            "dereference": dereference,
         }
         if account is not None:
             data["account"] = account