From 8559661911b8321a477bbd3c88e97ae75eba0fbd Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Tue, 12 Mar 2024 10:04:26 +0100 Subject: [PATCH] MAINT: roll-back some renaming changes (linkaheadadvancedtools) --- src/doc/administration/comments.rst | 2 +- src/doc/extension/query_templates.rst | 4 ++-- src/server_side_scripting/ext_file_download/zip_files.py | 6 +++--- .../ext_table_preview/pandas_table_preview.py | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/doc/administration/comments.rst b/src/doc/administration/comments.rst index ded141d9..06c4694c 100644 --- a/src/doc/administration/comments.rst +++ b/src/doc/administration/comments.rst @@ -79,7 +79,7 @@ Then sync the model: .. code:: python import linkahead as db - from linkaheadadvancedtools.models.parser import parse_model_from_json_schema + from caosadvancedtools.models.parser import parse_model_from_json_schema model = parse_model_from_yaml("datamodel.yaml") model.sync_data_model(noquestion=True) diff --git a/src/doc/extension/query_templates.rst b/src/doc/extension/query_templates.rst index 61ff470e..4643d5f3 100644 --- a/src/doc/extension/query_templates.rst +++ b/src/doc/extension/query_templates.rst @@ -232,6 +232,6 @@ The solution is to create the RecordTypes, e.g. using the Python interface, as f The data model is also included in the ``tools/query_template_datamodel.yml`` within this repository which can be imported into your database with ``python -m -linkaheadadvancedtools.models.parser --sync query_template_datamodel.yml`` (you need +caosadvancedtools.models.parser --sync query_template_datamodel.yml`` (you need to have `LinkAhead Advanced User -Tools<https://pypi.org/project/linkaheadadvancedtools/>`__ installed and configured). +Tools<https://pypi.org/project/caosadvancedtools/>`__ installed and configured). diff --git a/src/server_side_scripting/ext_file_download/zip_files.py b/src/server_side_scripting/ext_file_download/zip_files.py index 2ecfaa8c..6969af6b 100755 --- a/src/server_side_scripting/ext_file_download/zip_files.py +++ b/src/server_side_scripting/ext_file_download/zip_files.py @@ -32,7 +32,7 @@ from zipfile import ZipFile import linkahead as db import pandas as pd -from linkaheadadvancedtools.serverside import helper +from caosadvancedtools.serverside import helper from linkahead import LinkAheadException, ConsistencyError, EntityDoesNotExistError @@ -81,14 +81,14 @@ def collect_files_in_zip(ids, table): # Desired behavior: The script should go on with the other # ids, but the user should be informed about the missing files. # How should we do this? - logger = logging.getLogger("linkaheadadvancedtools") + logger = logging.getLogger("caosadvancedtools") logger.error("Did not find Entity with ID={}.".format( file_id)) raise e savename = nc.get_unique_savename(os.path.basename(tmp.path)) val_file = helper.get_file_via_download( - tmp, logger=logging.getLogger("linkaheadadvancedtools")) + tmp, logger=logging.getLogger("caosadvancedtools")) zf.write(val_file, savename) diff --git a/src/server_side_scripting/ext_table_preview/pandas_table_preview.py b/src/server_side_scripting/ext_table_preview/pandas_table_preview.py index 13c9b394..bc24201a 100755 --- a/src/server_side_scripting/ext_table_preview/pandas_table_preview.py +++ b/src/server_side_scripting/ext_table_preview/pandas_table_preview.py @@ -35,8 +35,8 @@ from datetime import datetime import linkahead as db import pandas as pd -from linkaheadadvancedtools.serverside.helper import get_argument_parser -from linkaheadadvancedtools.serverside.logging import configure_server_side_logging +from caosadvancedtools.serverside.helper import get_argument_parser +from caosadvancedtools.serverside.logging import configure_server_side_logging MAXIMUMFILESIZE = 1e8 VALID_ENDINGS = [".csv", ".tsv", ".xls", ".xlsx"] @@ -135,7 +135,7 @@ if __name__ == "__main__": args = parser.parse_args() debug_file = configure_server_side_logging() - logger = logging.getLogger("linkaheadadvancedtools") + logger = logging.getLogger("caosadvancedtools") db.configure_connection(auth_token=args.auth_token) entity_id = args.filename -- GitLab