cdiam-cli 0.1.2__tar.gz → 0.1.3__tar.gz

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/LICENSE.md

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) [year] [fullname]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) [year] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: cdiam-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: 
 Author: tungtp99
 Author-email: tungtp181199@gmail.com
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: datetime (>=5.5,<6.0)
 Requires-Dist: idna (==3.4)

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/README.md

@@ -1,28 +1,28 @@
-# CDIAM CLI
-
-This is a repository for CDIAM CLI. .
-
-## Getting Started
-
-To get started with this project, follow these steps:
-
-### From source
-1. Clone the repository: `git clone github.com/C-DIAM/cdiam-cli.git`
-2. Install: `poetry install` install poetry with https://python-poetry.org/docs/
-
-### From pypip
-Run `pip install cdiam-cli` 
-
-### View CLI command
-Run `cdiam-cli --help`
-
-## Features
-
-- Save token: `cdiam-cli save-token` must provide server endpoint E.g. https://c-diam.com/api and TOKEN get from CDIAM APP
-- Call API: `cdiam-cli call-api <PATH_TO_YAML_OR_JSON_PARAMS>` more detail about params schemas at `<SERVER_ENPOINT>/schemas/docs` E.g. https://c-diam.com/api/schemas/docs
-
-
-
-## License
-
-This project is licensed under the [MIT License](LICENSE).
+# CDIAM CLI
+
+This is a repository for CDIAM CLI. .
+
+## Getting Started
+
+To get started with this project, follow these steps:
+
+### From source
+1. Clone the repository: `git clone github.com/C-DIAM/cdiam-cli.git`
+2. Install: `poetry install` install poetry with https://python-poetry.org/docs/
+
+### From pypip
+Run `pip install cdiam-cli` 
+
+### View CLI command
+Run `cdiam-cli --help`
+
+## Features
+
+- Save token: `cdiam-cli save-token` must provide server endpoint E.g. https://c-diam.com/api and TOKEN get from CDIAM APP
+- Call API: `cdiam-cli call-api <PATH_TO_YAML_OR_JSON_PARAMS>` more detail about params schemas at `<SERVER_ENPOINT>/schemas/docs` E.g. https://c-diam.com/api/schemas/docs
+
+
+
+## License
+
+This project is licensed under the [MIT License](LICENSE).

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/__init__.py

@@ -1,2 +1,2 @@
-from . import api
-from . import helper
+from . import api
+from . import helper

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/__main__.py

@@ -1,4 +1,4 @@
-# python
-from .main import main_group
-
+# python
+from .main import main_group
+
 main_group()

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/api/__init__.py

@@ -1,4 +1,4 @@
-from .settings import save_token
-from .download import download_data
-from .api_action import call_api
-from . import utils
+from .settings import save_token
+from .download import download_data
+from .api_action import call_api
+from . import utils

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/api/api_action.py

@@ -1,123 +1,123 @@
-import json
-import click
-from cdiam_cli.helper import yaml_helper, curl_helper
-import subprocess
-from typing import Union, Callable, Any, Dict, overload, Literal
-from .settings import read_api_endpoint, read_api_token
-from cdiam_cli.schemas import ParamsRequestGetTaskStatus
-from cdiam_cli.schemas.analysis import AnalysisResultRead, AnalysisResult
-from time import sleep
-
-
-def wait_task(task_id: str):
-    while True:
-        sleep(5)
-        print("Load status info")
-        res = run(
-            ParamsRequestGetTaskStatus(api="get_task_status", task_id=task_id).dict()
-        )
-        status = AnalysisResultRead(**res)
-
-        if status.task is None:
-            raise Exception("Task FAILURE")
-        if status.task.status == "FAILURE":
-            raise Exception("Task FAILURE")
-        if status.task.status == "SUCCESS":
-            break
-    return status
-
-
-def parse_and_wait_task(process: Any):
-    analysis_result: AnalysisResult = AnalysisResult(**process)
-    assert analysis_result.task_id is not None
-    print(analysis_result)
-    status = wait_task(task_id=analysis_result.task_id)
-    print(status)
-    return status
-
-
-@overload
-def run(
-    params: Union[str, Dict[Any, Any]],
-    modify_params_callback: Union[Callable[[Any], Any], None] = None,
-    wait_as_analysis: Literal[False] = False,
-) -> Any: ...
-@overload
-def run(
-    params: Union[str, Dict[Any, Any]],
-    modify_params_callback: Union[Callable[[Any], Any], None] = None,
-    wait_as_analysis: Literal[True] = True,
-) -> AnalysisResult: ...
-def run(
-    params: Union[str, Dict[Any, Any]],
-    modify_params_callback: Union[Callable[[Any], Any], None] = None,
-    wait_as_analysis: bool = False,
-):
-    """
-    Runs an API call with the provided parameters and returns the API response.
-
-    Args:
-        params (Union[str, Dict[Any, Any]]): The API parameters, either as a path to a JSON or YAML file, or as a dictionary.
-        More details about api schemas can be found in the documentation at https://c-diam.com/api/schemas/docs or if you are using different endpoint you can find it at https://<your-end-point>/api/schemas/docs.
-        modify_params_callback (Union[Callable[[Any], Any], None]): An optional callback function to modify the API parameters before the call.
-        wait_as_analysis (bool): If True, the function will wait for the API task to complete and return the analysis result.
-
-    Returns:
-        Any: The API response, or an AnalysisResult if wait_as_analysis is True.
-
-    Raises:
-        Exception: If the API call fails.
-    """
-
-    if isinstance(params, str):
-        if params.endswith(".json"):
-            with open(params) as f:
-                data = json.load(f)
-        else:
-            data = yaml_helper.read(params)
-        if modify_params_callback is not None:
-            data = modify_params_callback(data)
-    else:
-        data = params
-
-    if data["api"] in ["upload_matrix"]:  # type: ignore
-        form_data = curl_helper.convert_json_to_form_data(data)
-        command = curl_helper.generate_curl_form_command(
-            form_data, endpoint=f"{read_api_endpoint()}/api_public/{data['api']}"  # type: ignore
-        )
-    else:
-        command = curl_helper.generate_curl_json_command(
-            data, endpoint=f"{read_api_endpoint()}/api_public/{data['api']}"  # type: ignore
-        )
-    command.append("-b")
-    command.append(f"cdiam_session_token={read_api_token()}")
-
-    process = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    process.check_returncode()
-    output = json.loads(process.stdout.decode())
-    if "detail" in output:
-        raise Exception(output)
-
-    if wait_as_analysis:
-        output = parse_and_wait_task(output)
-
-    return output
-
-
-@click.command()
-@click.argument("params", type=click.Path(exists=True), required=True)
-def call_api(params: str):
-    """
-    Calls the API with the provided parameters and returns the API response.
-
-    Args:
-        params (str): The path to a JSON or YAML file containing the API parameters. More details about api schemas can be found in the documentation at https://c-diam.com/api/schemas/docs or if you are using different endpoint you can find it at https://<your-end-point>/api/schemas/docs.
-    Returns:
-        str: The API response.
-
-    Raises:
-        Exception: If the API call fails.
-    """
-
-    data = run(params)
-    print(json.dumps(data, indent=4, sort_keys=True))
+import json
+import click
+from cdiam_cli.helper import yaml_helper, curl_helper
+import subprocess
+from typing import Union, Callable, Any, Dict, overload, Literal
+from .settings import read_api_endpoint, read_api_token
+from cdiam_cli.schemas import ParamsRequestGetTaskStatus
+from cdiam_cli.schemas.analysis import AnalysisResultRead, AnalysisResult
+from time import sleep
+
+
+def wait_task(task_id: str):
+    while True:
+        sleep(5)
+        print("Load status info")
+        res = run(
+            ParamsRequestGetTaskStatus(api="get_task_status", task_id=task_id).dict()
+        )
+        status = AnalysisResultRead(**res)
+
+        if status.task is None:
+            raise Exception("Task FAILURE")
+        if status.task.status == "FAILURE":
+            raise Exception("Task FAILURE")
+        if status.task.status == "SUCCESS":
+            break
+    return status
+
+
+def parse_and_wait_task(process: Any):
+    analysis_result: AnalysisResult = AnalysisResult(**process)
+    assert analysis_result.task_id is not None
+    print(analysis_result)
+    status = wait_task(task_id=analysis_result.task_id)
+    print(status)
+    return status
+
+
+@overload
+def run(
+    params: Union[str, Dict[Any, Any]],
+    modify_params_callback: Union[Callable[[Any], Any], None] = None,
+    wait_as_analysis: Literal[False] = False,
+) -> Any: ...
+@overload
+def run(
+    params: Union[str, Dict[Any, Any]],
+    modify_params_callback: Union[Callable[[Any], Any], None] = None,
+    wait_as_analysis: Literal[True] = True,
+) -> AnalysisResult: ...
+def run(
+    params: Union[str, Dict[Any, Any]],
+    modify_params_callback: Union[Callable[[Any], Any], None] = None,
+    wait_as_analysis: bool = False,
+):
+    """
+    Runs an API call with the provided parameters and returns the API response.
+
+    Args:
+        params (Union[str, Dict[Any, Any]]): The API parameters, either as a path to a JSON or YAML file, or as a dictionary.
+        More details about api schemas can be found in the documentation at https://c-diam.com/api/schemas/docs or if you are using different endpoint you can find it at https://<your-end-point>/api/schemas/docs.
+        modify_params_callback (Union[Callable[[Any], Any], None]): An optional callback function to modify the API parameters before the call.
+        wait_as_analysis (bool): If True, the function will wait for the API task to complete and return the analysis result.
+
+    Returns:
+        Any: The API response, or an AnalysisResult if wait_as_analysis is True.
+
+    Raises:
+        Exception: If the API call fails.
+    """
+
+    if isinstance(params, str):
+        if params.endswith(".json"):
+            with open(params) as f:
+                data = json.load(f)
+        else:
+            data = yaml_helper.read(params)
+        if modify_params_callback is not None:
+            data = modify_params_callback(data)
+    else:
+        data = params
+
+    if "upload_" in data["api"]:  # type: ignore
+        form_data = curl_helper.convert_json_to_form_data(data)
+        command = curl_helper.generate_curl_form_command(
+            form_data, endpoint=f"{read_api_endpoint()}/api_public/{data['api']}"  # type: ignore
+        )
+    else:
+        command = curl_helper.generate_curl_json_command(
+            data, endpoint=f"{read_api_endpoint()}/api_public/{data['api']}"  # type: ignore
+        )
+    command.append("-b")
+    command.append(f"cdiam_session_token={read_api_token()}")
+
+    process = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    process.check_returncode()
+    output = json.loads(process.stdout.decode())
+    if "detail" in output:
+        raise Exception(output)
+
+    if wait_as_analysis:
+        output = parse_and_wait_task(output)
+
+    return output
+
+
+@click.command()
+@click.argument("params", type=click.Path(exists=True), required=True)
+def call_api(params: str):
+    """
+    Calls the API with the provided parameters and returns the API response.
+
+    Args:
+        params (str): The path to a JSON or YAML file containing the API parameters. More details about api schemas can be found in the documentation at https://c-diam.com/api/schemas/docs or if you are using different endpoint you can find it at https://<your-end-point>/api/schemas/docs.
+    Returns:
+        str: The API response.
+
+    Raises:
+        Exception: If the API call fails.
+    """
+
+    data = run(params)
+    print(json.dumps(data, indent=4, sort_keys=True))

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/api/download.py

@@ -1,27 +1,27 @@
-import click
-import requests
-from urllib.request import urlopen
-from .settings import read_api_endpoint, read_api_token
-
-
-@click.command()
-@click.argument("object_id", type=str)
-def download_data(object_id: str):
-    """This api download data of given object_id"""
-    res = requests.get(
-        f"{read_api_endpoint()}/data/data/download-file/{object_id}",
-        cookies={"cdiam_session_token": read_api_token()},
-    )
-
-    if res.status_code != 200:
-        print(res.json())
-    else:
-        for url in res.json()["url"]:
-            response = urlopen(url)
-            file_name = response.headers.get_filename()
-            with requests.get(url, stream=True) as r:
-                r.raise_for_status()
-                with open(file_name, "wb") as f:
-                    for chunk in r.iter_content(chunk_size=8192):
-                        if chunk:
-                            f.write(chunk)
+import click
+import requests
+from urllib.request import urlopen
+from .settings import read_api_endpoint, read_api_token
+
+
+@click.command()
+@click.argument("object_id", type=str)
+def download_data(object_id: str):
+    """This api download data of given object_id"""
+    res = requests.get(
+        f"{read_api_endpoint()}/data/data/download-file/{object_id}",
+        cookies={"cdiam_session_token": read_api_token()},
+    )
+
+    if res.status_code != 200:
+        print(res.json())
+    else:
+        for url in res.json()["url"]:
+            response = urlopen(url)
+            file_name = response.headers.get_filename()
+            with requests.get(url, stream=True) as r:
+                r.raise_for_status()
+                with open(file_name, "wb") as f:
+                    for chunk in r.iter_content(chunk_size=8192):
+                        if chunk:
+                            f.write(chunk)

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/api/settings.py

@@ -1,59 +1,59 @@
-import click
-import os
-from os.path import expanduser
-import json
-
-
-def get_path_settings():
-    home = expanduser("~")
-    return os.path.join(home, ".cdiam_cli")
-
-
-def read_api_endpoint():
-    if not os.path.exists(get_path_settings()):
-        raise Exception("Run save-settings first")
-    with open(get_path_settings(), "r") as f:
-        settings = json.load(f)
-        if "endpoint" not in settings:
-            raise Exception(
-                "Cannot found endpoint setting. Please run save-settings first"
-            )
-        return settings["endpoint"]
-
-
-def read_api_token():
-    if not os.path.exists(get_path_settings()):
-        raise Exception("Run save-settings first")
-    with open(get_path_settings(), "r") as f:
-        settings = json.load(f)
-        if "token" not in settings:
-            raise Exception(
-                "Cannot found token setting. Please run save-settings first"
-            )
-        return settings["token"]
-
-
-class HiddenPassword(object):
-    def __init__(self, password=""):
-        self.password = password
-
-    def __str__(self):
-        return "*" * len(self.password)
-
-
-@click.command()
-def save_token():
-    """This api save your endpoint and your token in your machine"""
-    endpoint = click.prompt(
-        "Please enter the server endpoint E.g. https://c-diam.com/api", type=str
-    )
-    value = click.prompt("Please enter the token", type=HiddenPassword, hide_input=True)
-    with open(get_path_settings(), "w") as f:
-        json.dump(
-            {
-                "endpoint": endpoint,
-                "token": value.password,
-            },
-            f,
-        )
-    print(f"Save settings at {get_path_settings()}")
+import click
+import os
+from os.path import expanduser
+import json
+
+
+def get_path_settings():
+    home = expanduser("~")
+    return os.path.join(home, ".cdiam_cli")
+
+
+def read_api_endpoint():
+    if not os.path.exists(get_path_settings()):
+        raise Exception("Run save-settings first")
+    with open(get_path_settings(), "r") as f:
+        settings = json.load(f)
+        if "endpoint" not in settings:
+            raise Exception(
+                "Cannot found endpoint setting. Please run save-settings first"
+            )
+        return settings["endpoint"]
+
+
+def read_api_token():
+    if not os.path.exists(get_path_settings()):
+        raise Exception("Run save-settings first")
+    with open(get_path_settings(), "r") as f:
+        settings = json.load(f)
+        if "token" not in settings:
+            raise Exception(
+                "Cannot found token setting. Please run save-settings first"
+            )
+        return settings["token"]
+
+
+class HiddenPassword(object):
+    def __init__(self, password=""):
+        self.password = password
+
+    def __str__(self):
+        return "*" * len(self.password)
+
+
+@click.command()
+def save_token():
+    """This api save your endpoint and your token in your machine"""
+    endpoint = click.prompt(
+        "Please enter the server endpoint E.g. https://c-diam.com/api", type=str
+    )
+    value = click.prompt("Please enter the token", type=HiddenPassword, hide_input=True)
+    with open(get_path_settings(), "w") as f:
+        json.dump(
+            {
+                "endpoint": endpoint,
+                "token": value.password,
+            },
+            f,
+        )
+    print(f"Save settings at {get_path_settings()}")

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/command/__init__.py

@@ -1,2 +1,2 @@
-from . import project
+from . import project
 from . import data

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/command/data.py

@@ -1,33 +1,33 @@
-from typing import Any
-
-import click
-
-from cdiam_cli import api
-from cdiam_cli.schemas.base import MessageResponseError, MessageResponseSuccess
-
-
-@click.group('data')
-@click.pass_context
-def data_cli(ctx):
-    """
-    This command group provides various commands to show and manage data related to projects.
-    Use the subcommands under this group to interact with project effectively.
-    """
-    pass
-
-
-@data_cli.command('list')
-@click.argument('project_id')
-def list_all_data(project_id: str):
-    """
-        This command lists all available data in given project id.
-    """
-    try:
-        response: Any = api.api_action.run({
-            "api": "list_data",
-            "project_id": project_id
-        })
-        output = MessageResponseSuccess(data=response)
-    except Exception as e:
-        output = MessageResponseError(error=str(e))
-    click.echo(output.json())
+from typing import Any
+
+import click
+
+from cdiam_cli import api
+from cdiam_cli.schemas.base import MessageResponseError, MessageResponseSuccess
+
+
+@click.group('data')
+@click.pass_context
+def data_cli(ctx):
+    """
+    This command group provides various commands to show and manage data related to projects.
+    Use the subcommands under this group to interact with project effectively.
+    """
+    pass
+
+
+@data_cli.command('list')
+@click.argument('project_id')
+def list_all_data(project_id: str):
+    """
+        This command lists all available data in given project id.
+    """
+    try:
+        response: Any = api.api_action.run({
+            "api": "list_data",
+            "project_id": project_id
+        })
+        output = MessageResponseSuccess(data=response)
+    except Exception as e:
+        output = MessageResponseError(error=str(e))
+    click.echo(output.json())

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/command/project.py

@@ -1,29 +1,29 @@
-from typing import Any
-
-import click
-
-from cdiam_cli import api
-from cdiam_cli.schemas.base import MessageResponseError, MessageResponseSuccess
-
-
-@click.group('project')
-@click.pass_context
-def project_cli(ctx):
-    """
-    This command group provides various commands to show and manage data related to projects.
-    Use the subcommands under this group to interact with project effectively.
-    """
-    pass
-
-
-@project_cli.command('list')
-def list_all_project():
-    """
-        This command lists all the projects available in the system.
-    """
-    try:
-        response: Any = api.api_action.run({"api": 'list_project'})
-        output = MessageResponseSuccess(data=response)
-    except Exception as e:
-        output = MessageResponseError(error=str(e))
-    click.echo(output.json())
+from typing import Any
+
+import click
+
+from cdiam_cli import api
+from cdiam_cli.schemas.base import MessageResponseError, MessageResponseSuccess
+
+
+@click.group('project')
+@click.pass_context
+def project_cli(ctx):
+    """
+    This command group provides various commands to show and manage data related to projects.
+    Use the subcommands under this group to interact with project effectively.
+    """
+    pass
+
+
+@project_cli.command('list')
+def list_all_project():
+    """
+        This command lists all the projects available in the system.
+    """
+    try:
+        response: Any = api.api_action.run({"api": 'list_project'})
+        output = MessageResponseSuccess(data=response)
+    except Exception as e:
+        output = MessageResponseError(error=str(e))
+    click.echo(output.json())

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/helper/__init__.py

@@ -1,3 +1,3 @@
-from . import yaml_helper
-from . import curl_helper
+from . import yaml_helper
+from . import curl_helper
 from . import json_helper

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/helper/curl_helper.py

@@ -1,42 +1,42 @@
-import json
-from typing import Any, Dict
-
-
-def _convert(data: Any, ret: Dict[str, str], key: str):
-    if isinstance(data, dict):
-        for k in data.keys():
-            _convert(data[k], ret, f"{key}[{k}]" if key != "" else k)
-    elif isinstance(data, list):
-        for index, k in enumerate(data):
-            _convert(data[index], ret, f"{key}[{index}]")
-    else:
-        if data is not None:
-            ret[key] = data
-
-
-def generate_curl_form_command(form_data: Dict[str, str], endpoint: str):
-    command = ["curl", "-X", "POST", "-H", "Content-Type: multipart/form-data"]
-    for k, v in form_data.items():
-
-        command.append("-F")
-        if v is None or v.startswith("@"):
-            command.append(f'{k}={"null" if v is None  else v}')
-        else:
-            command.append(f'{k}="{v}"')
-
-    command.append(endpoint)
-    return command
-
-
-def generate_curl_json_command(json_data: Dict[str, str], endpoint: str):
-    command = ["curl", "-X", "POST", "-H", "Content-Type: application/json"]
-    command.append("-d")
-    command.append(json.dumps(json_data))
-    command.append(endpoint)
-    return command
-
-
-def convert_json_to_form_data(json_object: Any):
-    ret = {}
-    _convert(json_object, ret, "")
-    return ret
+import json
+from typing import Any, Dict
+
+
+def _convert(data: Any, ret: Dict[str, str], key: str):
+    if isinstance(data, dict):
+        for k in data.keys():
+            _convert(data[k], ret, f"{key}[{k}]" if key != "" else k)
+    elif isinstance(data, list):
+        for index, k in enumerate(data):
+            _convert(data[index], ret, f"{key}[{index}]")
+    else:
+        if data is not None:
+            ret[key] = data
+
+
+def generate_curl_form_command(form_data: Dict[str, str], endpoint: str):
+    command = ["curl", "-X", "POST", "-H", "Content-Type: multipart/form-data"]
+    for k, v in form_data.items():
+
+        command.append("-F")
+        if v is None or v.startswith("@"):
+            command.append(f'{k}={"null" if v is None  else v}')
+        else:
+            command.append(f'{k}="{v}"')
+
+    command.append(endpoint)
+    return command
+
+
+def generate_curl_json_command(json_data: Dict[str, str], endpoint: str):
+    command = ["curl", "-X", "POST", "-H", "Content-Type: application/json"]
+    command.append("-d")
+    command.append(json.dumps(json_data))
+    command.append(endpoint)
+    return command
+
+
+def convert_json_to_form_data(json_object: Any):
+    ret = {}
+    _convert(json_object, ret, "")
+    return ret

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/helper/json_helper.py

@@ -1,6 +1,6 @@
-import json
-
-def read(path: str):
-    with open(path ,'r') as f:
-        return json.load(f)
-            
+import json
+
+def read(path: str):
+    with open(path ,'r') as f:
+        return json.load(f)
+            

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/helper/yaml_helper.py

@@ -1,10 +1,10 @@
-import yaml
-
-def read(path: str):
-    with open(path) as stream:
-        try:
-            return yaml.safe_load(stream)
-        except yaml.YAMLError as exc:
-            print(exc)
-            raise Exception(exc)
-            
+import yaml
+
+def read(path: str):
+    with open(path) as stream:
+        try:
+            return yaml.safe_load(stream)
+        except yaml.YAMLError as exc:
+            print(exc)
+            raise Exception(exc)
+            

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/main.py

@@ -1,22 +1,22 @@
-import click
-
-from cdiam_cli import api
-from cdiam_cli.command import data, project
-
-
-@click.group()
-@click.pass_context
-def main_group(ctx):
-    pass
-
-
-# Groups
-main_group.add_command(project.project_cli)
-main_group.add_command(data.data_cli)
-
-# Single command
-main_group.add_command(api.call_api)
-main_group.add_command(api.save_token)
-
-if __name__ == "__main__":
-    main_group()
+import click
+
+from cdiam_cli import api
+from cdiam_cli.command import data, project
+
+
+@click.group()
+@click.pass_context
+def main_group(ctx):
+    pass
+
+
+# Groups
+main_group.add_command(project.project_cli)
+main_group.add_command(data.data_cli)
+
+# Single command
+main_group.add_command(api.call_api)
+main_group.add_command(api.save_token)
+
+if __name__ == "__main__":
+    main_group()

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/schemas/__init__.py

@@ -1 +1 @@
-from .schemas import *
+from .schemas import *

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/schemas/analysis.py

@@ -1,60 +1,60 @@
-from datetime import datetime
-from typing import Optional, List
-
-from pydantic import BaseModel
-
-
-class TaskStatus(BaseModel):
-    status: str = "UNKNOWN"
-
-
-class AnalysisResultBase(BaseModel):
-    result_id: str
-    data_id: str
-    analysis: int
-    task_id: str
-    args: str
-    project_id: str
-    user_email: Optional[str]
-
-
-class AnalysisCatalogBase(BaseModel):
-    name: str
-    description: Optional[str]
-
-
-class AnalysisCatalog(AnalysisCatalogBase):
-    """
-    This table stores available analyses type
-    that the App supports.
-    """
-
-    id: int
-    time_created: datetime
-    time_modified: datetime
-    """A list of all analysis results of this type"""
-    results: List["AnalysisResult"]
-
-
-class AnalysisResultRead(AnalysisResultBase):
-    """
-    A response model of an anlysis result
-    """
-
-    time_created: datetime
-    time_modified: datetime
-    task: Optional[TaskStatus]
-    result_data_status: Optional[str]
-
-
-class AnalysisResult(AnalysisResultBase):
-    """
-    This table stores all analyses that had been produced for a data
-    The analysis reference points to the description of the analysis.
-    The result_id reference points to the detail result of the analysis
-    """
-
-    time_created: datetime
-    time_modified: datetime
-    """An object of the analysis type"""
-    analysis_orm: AnalysisCatalog
+from datetime import datetime
+from typing import Optional, List
+
+from pydantic import BaseModel
+
+
+class TaskStatus(BaseModel):
+    status: str = "UNKNOWN"
+
+
+class AnalysisResultBase(BaseModel):
+    result_id: str
+    data_id: str
+    analysis: int
+    task_id: str
+    args: str
+    project_id: str
+    user_email: Optional[str]
+
+
+class AnalysisCatalogBase(BaseModel):
+    name: str
+    description: Optional[str]
+
+
+class AnalysisCatalog(AnalysisCatalogBase):
+    """
+    This table stores available analyses type
+    that the App supports.
+    """
+
+    id: int
+    time_created: datetime
+    time_modified: datetime
+    """A list of all analysis results of this type"""
+    results: List["AnalysisResult"]
+
+
+class AnalysisResultRead(AnalysisResultBase):
+    """
+    A response model of an anlysis result
+    """
+
+    time_created: datetime
+    time_modified: datetime
+    task: Optional[TaskStatus]
+    result_data_status: Optional[str]
+
+
+class AnalysisResult(AnalysisResultBase):
+    """
+    This table stores all analyses that had been produced for a data
+    The analysis reference points to the description of the analysis.
+    The result_id reference points to the detail result of the analysis
+    """
+
+    time_created: datetime
+    time_modified: datetime
+    """An object of the analysis type"""
+    analysis_orm: AnalysisCatalog

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/schemas/base.py

@@ -1,28 +1,28 @@
-from enum import Enum
-from typing import Any
-
-from pydantic import BaseModel
-
-
-class MessageStatusEnum(str, Enum):
-    SUCCESS = "success"
-    ERROR = "error"
-
-
-class MessageResponse(BaseModel):
-    status: MessageStatusEnum
-    error: str
-    data: Any
-
-    class Config:
-        allow_population_by_field_name = True
-
-
-class MessageResponseSuccess(MessageResponse):
-    status: MessageStatusEnum = MessageStatusEnum.SUCCESS
-    error: str = ""
-
-
-class MessageResponseError(MessageResponse):
-    status: MessageStatusEnum = MessageStatusEnum.ERROR
-    data: Any = None
+from enum import Enum
+from typing import Any
+
+from pydantic import BaseModel
+
+
+class MessageStatusEnum(str, Enum):
+    SUCCESS = "success"
+    ERROR = "error"
+
+
+class MessageResponse(BaseModel):
+    status: MessageStatusEnum
+    error: str
+    data: Any
+
+    class Config:
+        allow_population_by_field_name = True
+
+
+class MessageResponseSuccess(MessageResponse):
+    status: MessageStatusEnum = MessageStatusEnum.SUCCESS
+    error: str = ""
+
+
+class MessageResponseError(MessageResponse):
+    status: MessageStatusEnum = MessageStatusEnum.ERROR
+    data: Any = None

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/schemas/project.py

@@ -1,36 +1,36 @@
-from datetime import datetime
-from typing import Optional
-
-from pydantic import validator
-from cdiam_cli.schemas import ProjectSettings
-from pydantic import BaseModel
-
-
-class ProjectBase(BaseModel):
-    name: str
-
-
-class Project(ProjectBase):
-
-    id: str
-    tombstone: Optional[bool]
-    time_created: datetime
-    is_public: bool
-    delete_date: Optional[datetime]
-    settings: Optional[str]
-    storage_used: int
-    created_by: str
-
-    @validator("settings")
-    def validate_settings(cls, v: str):
-        if v == "nan":
-            v = "{}"
-        if v is None:
-            v = "{}"
-        return ProjectSettings.encode_settings(ProjectSettings.decode_setting(v))
-
-    @validator("tombstone")
-    def validate_tombstone(cls, v):
-        if not v:
-            return False
-        return v
+from datetime import datetime
+from typing import Optional
+
+from pydantic import validator
+from cdiam_cli.schemas import ProjectSettings
+from pydantic import BaseModel
+
+
+class ProjectBase(BaseModel):
+    name: str
+
+
+class Project(ProjectBase):
+
+    id: str
+    tombstone: Optional[bool]
+    time_created: datetime
+    is_public: bool
+    delete_date: Optional[datetime]
+    settings: Optional[str]
+    storage_used: int
+    created_by: str
+
+    @validator("settings")
+    def validate_settings(cls, v: str):
+        if v == "nan":
+            v = "{}"
+        if v is None:
+            v = "{}"
+        return ProjectSettings.encode_settings(ProjectSettings.decode_setting(v))
+
+    @validator("tombstone")
+    def validate_tombstone(cls, v):
+        if not v:
+            return False
+        return v

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/cdiam_cli/schemas/schemas.py

@@ -1,36 +1,36 @@
-from typing import Literal
-from pydantic import BaseModel
-from typing import Union, List, Dict, Any
-import json
-
-
-class ProjectSettings(BaseModel):
-    class Config:
-        orm_mode = True
-
-    cpdb: List[str] = []
-    enrichment: List[str] = []
-
-    @staticmethod
-    def encode_settings(settings: Union[Dict[str, Any], "ProjectSettings"]) -> str:
-        return ProjectSettings.parse_obj(settings).json()
-
-    @staticmethod
-    def decode_setting(settings: str) -> "ProjectSettings":
-        if settings is None:
-            settings = "{}"
-        return ProjectSettings.parse_obj(json.loads(settings))
-
-
-class ParamsRequestGetTaskStatus(BaseModel):
-    """
-    Represents the parameters for a request to get the status of an analysis task.
-
-    :param api: The API endpoint being called, which should be "get_task_status".
-    :param task_id: The unique identifier of the analysis task.
-    """
-
-    api: Literal["get_task_status"]
-    task_id: str
-
-
+from typing import Literal
+from pydantic import BaseModel
+from typing import Union, List, Dict, Any
+import json
+
+
+class ProjectSettings(BaseModel):
+    class Config:
+        orm_mode = True
+
+    cpdb: List[str] = []
+    enrichment: List[str] = []
+
+    @staticmethod
+    def encode_settings(settings: Union[Dict[str, Any], "ProjectSettings"]) -> str:
+        return ProjectSettings.parse_obj(settings).json()
+
+    @staticmethod
+    def decode_setting(settings: str) -> "ProjectSettings":
+        if settings is None:
+            settings = "{}"
+        return ProjectSettings.parse_obj(json.loads(settings))
+
+
+class ParamsRequestGetTaskStatus(BaseModel):
+    """
+    Represents the parameters for a request to get the status of an analysis task.
+
+    :param api: The API endpoint being called, which should be "get_task_status".
+    :param task_id: The unique identifier of the analysis task.
+    """
+
+    api: Literal["get_task_status"]
+    task_id: str
+
+

{cdiam_cli-0.1.2 → cdiam_cli-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cdiam-cli"
-version = "0.1.2"
+version = "0.1.3"
 description = ""
 authors = ["tungtp99 <tungtp181199@gmail.com>"]
 readme = "README.md"
@@ -26,4 +26,4 @@ build-backend = "poetry.core.masonry.api"
 
 
 [tool.poetry.scripts]
-cdiam-cli = 'cdiam_cli.main:main_group' 
+cdiam-cli = 'cdiam_cli.main:main_group'