diff --git a/src/doc/Makefile b/src/doc/Makefile index 1f781ca0ed6bbced5740f886436365150027c1f1..e1a253ee0fd316cde0fb91fea5f6669885d033d1 100644 --- a/src/doc/Makefile +++ b/src/doc/Makefile @@ -28,7 +28,7 @@ SPHINXOPTS ?= -a SPHINXBUILD ?= sphinx-build SPHINXAPIDOC ?= sphinx-apidoc -PY_BASEDIR = ../caosadvancedtools +PY_BASEDIR = ../linkaheadadvancedtools SOURCEDIR = . BUILDDIR = ../../build/doc diff --git a/src/doc/conf.py b/src/doc/conf.py index a33bf002ee6ab5bed79e2e35f77ac2fe4cfe3d35..0de862860492d7e658901179dd79462751c2596c 100644 --- a/src/doc/conf.py +++ b/src/doc/conf.py @@ -22,7 +22,7 @@ import sphinx_rtd_theme # -- Project information ----------------------------------------------------- -project = 'caosadvancedtools' +project = 'linkaheadadvancedtools' copyright = '2021, IndiScale GmbH' author = 'Daniel Hornung' @@ -111,7 +111,7 @@ html_static_path = [] # -- Options for HTMLHelp output --------------------------------------------- # Output file base name for HTML help builder. -htmlhelp_basename = 'caosadvancedtoolsdoc' +htmlhelp_basename = 'linkaheadadvancedtoolsdoc' # -- Options for LaTeX output ------------------------------------------------ @@ -138,7 +138,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'caosadvancedtools.tex', 'caosadvancedtools Documentation', + (master_doc, 'linkaheadadvancedtools.tex', 'linkaheadadvancedtools Documentation', 'IndiScale GmbH', 'manual'), ] @@ -148,7 +148,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'caosadvancedtools', 'caosadvancedtools Documentation', + (master_doc, 'linkaheadadvancedtools', 'linkaheadadvancedtools Documentation', [author], 1) ] @@ -159,8 +159,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'caosadvancedtools', 'caosadvancedtools Documentation', - author, 'caosadvancedtools ', 'One line description of project.', + (master_doc, 'linkaheadadvancedtools', 'linkaheadadvancedtools Documentation', + author, 'linkaheadadvancedtools ', 'One line description of project.', 'Miscellaneous'), ] diff --git a/src/doc/crawler.rst b/src/doc/crawler.rst index aea023192c0b95c784d5ac91ade12d0c30591d42..14e19d81fc8659923722e56eab601a8812912337 100644 --- a/src/doc/crawler.rst +++ b/src/doc/crawler.rst @@ -3,7 +3,7 @@ CaosDB Crawler ============== The `CaosDB -crawler <https://gitlab.com/caosdb/caosdb-advanced-user-tools/blob/main/src/caosadvancedtools/crawler.py>`__ +crawler <https://gitlab.com/caosdb/caosdb-advanced-user-tools/blob/main/src/linkaheadadvancedtools/crawler.py>`__ is a tool for the automated insertion or update of entities in CaosDB. Typically, a file structure is crawled, but other things can be crawled as well. For example tables or HDF5 files. @@ -37,7 +37,7 @@ different components of the CaosDB Crawler can be found in the In case you are happy with our suggestion of a standard crawler, feel free to use the standard crawler. The standard crawler lives in the submodule -`caosadvancedtools.scifolder` +`linkaheadadvancedtools.scifolder` Usage ===== @@ -109,12 +109,12 @@ Otherwise, you can only crawl files that were previously inserted by loadFiles ~~~~~~~~~ -After installation of the ``caosadvancedtools`` you can simply call the +After installation of the ``linkaheadadvancedtools`` you can simply call the function ``loadFiles`` contained in the package: :: - python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot + python3 -m linkaheadadvancedtools.loadFiles /opt/caosdb/mnt/extroot ``/opt/caosdb/mnt/extroot`` is the root of the file system to be crawled as seen by the CaosDB server (The actual path may vary. This is the used @@ -149,21 +149,21 @@ CFood -- Introduction ---------------------- A ``CFood`` is a Python class that inherits from the abstract base -class :py:class:`~caosadvancedtools.cfood.AbstractCFood`. +class :py:class:`~linkaheadadvancedtools.cfood.AbstractCFood`. It should be independent of other data and define the following methods: -1. :py:meth:`~caosadvancedtools.cfood.AbstractFileCFood.get_re` +1. :py:meth:`~linkaheadadvancedtools.cfood.AbstractFileCFood.get_re` This *static* method is required for classes which inherit from - :py:class:`~caosadvancedtools.cfood.AbstractFileCFood`. It returns a regular expression to + :py:class:`~linkaheadadvancedtools.cfood.AbstractFileCFood`. It returns a regular expression to identify files that can be consumed by this CFood. For other CFood implementations, overload - the :py:meth:`~caosadvancedtools.cfood.AbstractCFood.match_item` method. -2. :py:meth:`~caosadvancedtools.cfood.AbstractCFood.create_identifiables` + the :py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.match_item` method. +2. :py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.create_identifiables` This method defines (and inserts if necessary) the identifiables which may be updated at a later stage. After calling this method, the ``AbstractCFood.identifiables`` Container contains those Records which will be updated at a later time. -3. :py:meth:`~caosadvancedtools.cfood.AbstractCFood.update_identifiables` +3. :py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.update_identifiables` This method updates the stored identifiables as necessary. All Entities which need to be updated on the Server must be in ``AbstractCFood.to_be_updated`` after this call. @@ -198,7 +198,7 @@ In short, the Crawler interacts with the available CFoods in the following way: #. The Crawler iterates over the available objects (for example files), and for each object ``o``. #. The Crawler tests which of the available CFoods can consume the object ``o``, using the CFoods' - :py:meth:`~caosadvancedtools.cfood.AbstractCFood.match_item` class method. + :py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.match_item` class method. #. If the CFood matches against the object, an instance of that CFood is instantiated with that object ``o`` and stored for later, like ``cfoods.append(CFood(o))``. @@ -226,9 +226,9 @@ The following sketch aims to visualize this procedure. are synced to CaosDB in the last step. .. note:: **Practical hint:** After the call to - :py:meth:`~caosadvancedtools.cfood.AbstractCFood.create_identifiables`, the Crawler + :py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.create_identifiables`, the Crawler guarantees that an ``Experiment`` with those properties exists in CaosDB. In the call to - :py:meth:`~caosadvancedtools.cfood.AbstractCFood.update_identifiables`, further properties + :py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.update_identifiables`, further properties might be added to this Record, e.g. references to data files that were recorded in that experiment or to the person that did the experiment. @@ -240,7 +240,7 @@ Let’s look at the following Example: .. code:: python >>> # Example CFood - >>> from caosadvancedtools.cfood import AbstractFileCFood, assure_has_property + >>> from linkaheadadvancedtools.cfood import AbstractFileCFood, assure_has_property >>> import caosdb as db >>> >>> class ExampleCFood(AbstractFileCFood): @@ -269,7 +269,7 @@ Let’s look at the following Example: Every child of ``AbstractFileCFood`` (``AbstractFileCFood`` is for crawling files…, and yes, you can crawl other stuff as well) needs to implement the functions ``get_re``, ``create_identifiables``, -``update_identifiables``. The function :py:meth:`~caosadvancedtools.cfood.AbstractFileCFood.get_re` +``update_identifiables``. The function :py:meth:`~linkaheadadvancedtools.cfood.AbstractFileCFood.get_re` defines which files shall be treated with this CFood. The function needs to return a string with a regular expression. Here, the expression matches any "README.md" file that is located below two folder levels @@ -277,9 +277,9 @@ like: ``/any/path/whale/2020-01-01/README.md``. Note that the groups defined in the regular expressions (``date`` and ``species``) can be later used via ``self.match.group('name')``. -:py:meth:`~caosadvancedtools.cfood.AbstractCFood.create_identifiables` +:py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.create_identifiables` defines the ``identifiables`` that are needed and -:py:meth:`~caosadvancedtools.cfood.AbstractCFood.update_identifiables` +:py:meth:`~linkaheadadvancedtools.cfood.AbstractCFood.update_identifiables` applies additional changes. Here, an ``Experiment`` Record is identified using solely the date. This implies that there must NOT exist two ``Experiment`` Records with the same date. If this might occur, an @@ -328,7 +328,7 @@ In the ``crawl.py`` file, you should set this appropriately: .. code:: python - >>> from caosadvancedtools.cfood import fileguide + >>> from linkaheadadvancedtools.cfood import fileguide >>> import os >>> fileguide.access = lambda path: "/main/data/" + path @@ -365,8 +365,8 @@ function, a security level can be given. .. code:: python - >>> from caosadvancedtools.crawler import FileCrawler - >>> from caosadvancedtools.guard import RETRIEVE, INSERT, UPDATE + >>> from linkaheadadvancedtools.crawler import FileCrawler + >>> from linkaheadadvancedtools.guard import RETRIEVE, INSERT, UPDATE >>> files = [] # put files to be crawled in this list >>> c = FileCrawler( ... files=files, @@ -375,7 +375,7 @@ function, a security level can be given. >>> c.crawl(security_level=INSERT) This assures that every manipulation of data in CaosDB that is done via the functions provided by -the :py:class:`~caosadvancedtools.guard` class is checked against the provided security level: +the :py:class:`~linkaheadadvancedtools.guard` class is checked against the provided security level: - ``RETRIEVE``: allows only to retrieve data from CaosDB. No manipulation is allowed - ``INSERT``: allows only to insert new entities and the manipulation of those newly inserted ones diff --git a/src/doc/index.rst b/src/doc/index.rst index 5fdb78da4eddfd0145d0357202246d4b5352dcf4..6999d27f769d766a4640916e6e3e38596d3359f0 100644 --- a/src/doc/index.rst +++ b/src/doc/index.rst @@ -1,4 +1,4 @@ -Welcome to caosadvancedtools' documentation! +Welcome to linkaheadadvancedtools' documentation! ============================================ Welcome to the advanced Python tools for CaosDB! diff --git a/src/doc/yaml_interface.rst b/src/doc/yaml_interface.rst index 78ff4cdd6fee201c7ebe17977f497b84e9657aa2..e0152772ed29dbc8927eabcaef81358a11ba3904 100644 --- a/src/doc/yaml_interface.rst +++ b/src/doc/yaml_interface.rst @@ -3,7 +3,7 @@ YAML data model specification =============================== -The ``caosadvancedtools`` library features the possibility to create and update +The ``linkaheadadvancedtools`` library features the possibility to create and update CaosDB models using a simplified definition in YAML format. Let's start with an example taken from `model.yml @@ -119,13 +119,13 @@ You can use the yaml parser directly in python as follows: .. code-block:: python - from caosadvancedtools.models import parser as parser + from linkaheadadvancedtools.models import parser as parser model = parser.parse_model_from_yaml("model.yml") This creates a DataModel object containing all entities defined in the yaml file. -You can then use the functions from caosadvancedtools.models.data_model.DataModel to synchronize +You can then use the functions from linkaheadadvancedtools.models.data_model.DataModel to synchronize the model with a CaosDB instance, e.g.: .. code-block:: python diff --git a/src/linkaheadadvancedtools/cfoods/h5.py b/src/linkaheadadvancedtools/cfoods/h5.py index dd580bc5be917d09e65b920ab825f64fb779440a..482e154d5f7b4bbcece5cbfeadd15bd00c54af74 100644 --- a/src/linkaheadadvancedtools/cfoods/h5.py +++ b/src/linkaheadadvancedtools/cfoods/h5.py @@ -39,7 +39,7 @@ from copy import deepcopy import caosdb as db import h5py import numpy as np -from caosadvancedtools.cfood import fileguide +from linkaheadadvancedtools.cfood import fileguide from caosdb.common.datatype import is_reference from caosdb.common.utils import uuid diff --git a/src/linkaheadadvancedtools/crawler.py b/src/linkaheadadvancedtools/crawler.py index 154076bf692baf9f25e6085a5b08a6d1b6cfbd56..8afab698e3902fd9f08d4a7f2cd5a75975dd1177 100644 --- a/src/linkaheadadvancedtools/crawler.py +++ b/src/linkaheadadvancedtools/crawler.py @@ -169,7 +169,7 @@ class Crawler(object): self.abort_on_exception = abort_on_exception self.update_cache = UpdateCache() self.filterKnown = SuppressKnown() - advancedtoolslogger = logging.getLogger("caosadvancedtools") + advancedtoolslogger = logging.getLogger("linkaheadadvancedtools") # TODO this seems to be a bad idea. What if the handler was not added # yet? What if there is another stream handler, which shall not be diff --git a/src/linkaheadadvancedtools/import_from_xml.py b/src/linkaheadadvancedtools/import_from_xml.py index b93783e29347ce83098af2b8df25e36b695e2160..816dc5ceab6d894f9eb30062a8ff2cd85a06c55b 100755 --- a/src/linkaheadadvancedtools/import_from_xml.py +++ b/src/linkaheadadvancedtools/import_from_xml.py @@ -33,7 +33,7 @@ from tempfile import NamedTemporaryFile import caosdb as db from caosdb.apiutils import apply_to_ids -from caosadvancedtools.models.data_model import DataModel +from linkaheadadvancedtools.models.data_model import DataModel def create_dummy_file(text="Please ask the administrator for this file."): diff --git a/src/linkaheadadvancedtools/scifolder/analysis_cfood.py b/src/linkaheadadvancedtools/scifolder/analysis_cfood.py index 27cb871aed08f41531c367567ea36ea9a3faaf69..a4a27abca08a17d61e3593e16263b494c76f5ec0 100644 --- a/src/linkaheadadvancedtools/scifolder/analysis_cfood.py +++ b/src/linkaheadadvancedtools/scifolder/analysis_cfood.py @@ -20,10 +20,10 @@ import os from itertools import chain import caosdb as db -from caosadvancedtools.cfood import (AbstractFileCFood, assure_has_parent, +from linkaheadadvancedtools.cfood import (AbstractFileCFood, assure_has_parent, assure_has_property, assure_object_is_in_list, get_entity) -from caosadvancedtools.read_md_header import get_header +from linkaheadadvancedtools.read_md_header import get_header from .generic_pattern import full_pattern from .utils import (get_files_referenced_by_field, parse_responsibles, diff --git a/src/linkaheadadvancedtools/scifolder/experiment_cfood.py b/src/linkaheadadvancedtools/scifolder/experiment_cfood.py index 38606b5f8ffd372d7bf6f507ed96738d9345f16c..53b814e489473d5f22fafee52129c6b8a7559a2e 100644 --- a/src/linkaheadadvancedtools/scifolder/experiment_cfood.py +++ b/src/linkaheadadvancedtools/scifolder/experiment_cfood.py @@ -17,10 +17,10 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. import caosdb as db -from caosadvancedtools.cfood import (AbstractFileCFood, assure_has_description, +from linkaheadadvancedtools.cfood import (AbstractFileCFood, assure_has_description, assure_has_parent, assure_has_property, assure_object_is_in_list, get_entity) -from caosadvancedtools.read_md_header import get_header +from linkaheadadvancedtools.read_md_header import get_header from .generic_pattern import full_pattern from .utils import parse_responsibles, reference_records_corresponding_to_files diff --git a/src/linkaheadadvancedtools/scifolder/publication_cfood.py b/src/linkaheadadvancedtools/scifolder/publication_cfood.py index fc78e5b759e98e8989c952ccbafeef117e2ed33d..8d13905c6ed7e95fde5241fb894ae5552d038d3a 100644 --- a/src/linkaheadadvancedtools/scifolder/publication_cfood.py +++ b/src/linkaheadadvancedtools/scifolder/publication_cfood.py @@ -20,11 +20,11 @@ import os from itertools import chain import caosdb as db -from caosadvancedtools.cfood import (AbstractFileCFood, +from linkaheadadvancedtools.cfood import (AbstractFileCFood, assure_object_is_in_list, fileguide, get_entity) -from caosadvancedtools.read_md_header import get_header -from caosadvancedtools.utils import find_records_that_reference_ids +from linkaheadadvancedtools.read_md_header import get_header +from linkaheadadvancedtools.utils import find_records_that_reference_ids from .generic_pattern import date_suffix_pattern, readme_pattern from .utils import (get_files_referenced_by_field, parse_responsibles, diff --git a/src/linkaheadadvancedtools/scifolder/result_table_cfood.py b/src/linkaheadadvancedtools/scifolder/result_table_cfood.py index deaa2d00118659a9b177a05fe40b19a1793a16fb..7b89fac8f0236be743eaaae754c4d2427a402dc3 100644 --- a/src/linkaheadadvancedtools/scifolder/result_table_cfood.py +++ b/src/linkaheadadvancedtools/scifolder/result_table_cfood.py @@ -20,10 +20,10 @@ import re import caosdb as db import pandas as pd -from caosadvancedtools.cfood import (AbstractFileCFood, assure_has_description, +from linkaheadadvancedtools.cfood import (AbstractFileCFood, assure_has_description, assure_has_parent, assure_has_property, assure_object_is_in_list, get_entity) -from caosadvancedtools.read_md_header import get_header +from linkaheadadvancedtools.read_md_header import get_header from ..cfood import assure_property_is, fileguide from .experiment_cfood import ExperimentCFood diff --git a/src/linkaheadadvancedtools/scifolder/simulation_cfood.py b/src/linkaheadadvancedtools/scifolder/simulation_cfood.py index c8f23f1485d7a1f64dcd940552051d2e1ec5bb07..73f270d7465c5bcd7168498e3f09d829448434ad 100644 --- a/src/linkaheadadvancedtools/scifolder/simulation_cfood.py +++ b/src/linkaheadadvancedtools/scifolder/simulation_cfood.py @@ -20,10 +20,10 @@ import os from itertools import chain import caosdb as db -from caosadvancedtools.cfood import (AbstractFileCFood, assure_has_parent, +from linkaheadadvancedtools.cfood import (AbstractFileCFood, assure_has_parent, assure_has_property, assure_object_is_in_list, get_entity) -from caosadvancedtools.read_md_header import get_header +from linkaheadadvancedtools.read_md_header import get_header from .generic_pattern import full_pattern from .utils import (get_files_referenced_by_field, parse_responsibles, diff --git a/src/linkaheadadvancedtools/scifolder/software_cfood.py b/src/linkaheadadvancedtools/scifolder/software_cfood.py index 77fb46521e9aab875b6f99d0a1ee4ac44177e09c..2b9adbeba67ecef929cce566de961e6eb55c6547 100644 --- a/src/linkaheadadvancedtools/scifolder/software_cfood.py +++ b/src/linkaheadadvancedtools/scifolder/software_cfood.py @@ -21,11 +21,11 @@ import os from itertools import chain import caosdb as db -from caosadvancedtools.cfood import (AbstractFileCFood, assure_has_parent, +from linkaheadadvancedtools.cfood import (AbstractFileCFood, assure_has_parent, assure_has_property, assure_name_is, assure_object_is_in_list, get_entity) -from caosadvancedtools.guard import global_guard as guard -from caosadvancedtools.read_md_header import get_header +from linkaheadadvancedtools.guard import global_guard as guard +from linkaheadadvancedtools.read_md_header import get_header from .generic_pattern import full_pattern from .utils import get_files_referenced_by_field, parse_responsibles diff --git a/src/linkaheadadvancedtools/scifolder/utils.py b/src/linkaheadadvancedtools/scifolder/utils.py index 50e897c7d2f19c6269ec622489c5a2c6ce1a28e0..177e120f59812ef61bd346be376cfc044590fa40 100644 --- a/src/linkaheadadvancedtools/scifolder/utils.py +++ b/src/linkaheadadvancedtools/scifolder/utils.py @@ -23,13 +23,13 @@ from itertools import chain import caosdb as db import pandas as pd -from caosadvancedtools.cfood import assure_object_is_in_list, fileguide -from caosadvancedtools.utils import (find_records_that_reference_ids, +from linkaheadadvancedtools.cfood import assure_object_is_in_list, fileguide +from linkaheadadvancedtools.utils import (find_records_that_reference_ids, read_field_as_list, return_field_or_property, string_to_person) -logger = logging.getLogger("caosadvancedtools") +logger = logging.getLogger("linkaheadadvancedtools") def parse_responsibles(header): diff --git a/src/linkaheadadvancedtools/scifolder/withreadme.py b/src/linkaheadadvancedtools/scifolder/withreadme.py index e1968ba49799827467c7ef93a7070b7f090010fb..c943abbfab79087712c01f8d093a231b4f43ab99 100644 --- a/src/linkaheadadvancedtools/scifolder/withreadme.py +++ b/src/linkaheadadvancedtools/scifolder/withreadme.py @@ -23,12 +23,12 @@ import os from dataclasses import dataclass import caosdb as db -from caosadvancedtools.cfood import (assure_has_description, assure_has_parent, +from linkaheadadvancedtools.cfood import (assure_has_description, assure_has_parent, assure_object_is_in_list, fileguide) -from caosadvancedtools.read_md_header import get_header as get_md_header -from caosadvancedtools.table_importer import (win_path_converter, +from linkaheadadvancedtools.read_md_header import get_header as get_md_header +from linkaheadadvancedtools.table_importer import (win_path_converter, win_path_list_converter) -from caosadvancedtools.utils import return_field_or_property +from linkaheadadvancedtools.utils import return_field_or_property from .utils import (get_entity_ids_from_include_file, get_files_referenced_by_field, get_xls_header) @@ -267,7 +267,7 @@ class WithREADME(object): os.path.dirname(self.crawled_path), # pylint: disable=no-member item[INCLUDE.key])) except ValueError: - al = logging.getLogger("caosadvancedtools") + al = logging.getLogger("linkaheadadvancedtools") al.warning("The include file cannot be read. Please " "make sure, it contains an 'ID' column." " The file is ignored." diff --git a/src/linkaheadadvancedtools/serverside/examples/example_script.py b/src/linkaheadadvancedtools/serverside/examples/example_script.py index c28b58a7eb18e03fa65c01f786b1f1e9b6e1c8bd..3a02e35c1a423bbfc7d2e5a5180eee386ebffed1 100755 --- a/src/linkaheadadvancedtools/serverside/examples/example_script.py +++ b/src/linkaheadadvancedtools/serverside/examples/example_script.py @@ -48,11 +48,11 @@ from datetime import datetime import caosdb as db import matplotlib.pyplot as plt import numpy as np -from caosadvancedtools.cfood import assure_property_is -from caosadvancedtools.crawler import apply_list_of_updates -from caosadvancedtools.guard import INSERT, UPDATE -from caosadvancedtools.guard import global_guard as guard -from caosadvancedtools.serverside.helper import send_mail as main_send_mail +from linkaheadadvancedtools.cfood import assure_property_is +from linkaheadadvancedtools.crawler import apply_list_of_updates +from linkaheadadvancedtools.guard import INSERT, UPDATE +from linkaheadadvancedtools.guard import global_guard as guard +from linkaheadadvancedtools.serverside.helper import send_mail as main_send_mail # logging should be done like this in order to allow the caller script to # direct the output. diff --git a/src/linkaheadadvancedtools/serverside/logging.py b/src/linkaheadadvancedtools/serverside/logging.py index 33f5bae1a91b4bd49db32248125561fdb2bd69e5..969b4a84a2da350c1dc1244d9d46ea60a56fb1d8 100644 --- a/src/linkaheadadvancedtools/serverside/logging.py +++ b/src/linkaheadadvancedtools/serverside/logging.py @@ -29,7 +29,7 @@ from ..webui_formatter import WebUI_Formatter from .helper import get_shared_filename -def configure_server_side_logging(loggername="caosadvancedtools"): +def configure_server_side_logging(loggername="linkaheadadvancedtools"): """ Set logging up to save one plain debugging log file, one plain info log file (for users) and a stdout stream with messages wrapped in html elements diff --git a/src/linkaheadadvancedtools/serverside/sync.py b/src/linkaheadadvancedtools/serverside/sync.py index 04283a15ba7919af6027b53217ffb69355ddfc6f..3b92e4858bc8ff78c36cf318c215d840f09d16b5 100755 --- a/src/linkaheadadvancedtools/serverside/sync.py +++ b/src/linkaheadadvancedtools/serverside/sync.py @@ -2,6 +2,6 @@ # Sync data model for generic data analysis method # A. Schlemmer, 09/2021 -from caosadvancedtools.models import parser +from linkaheadadvancedtools.models import parser model = parser.parse_model_from_yaml("model.yml") model.sync_data_model() diff --git a/src/linkaheadadvancedtools/suppressKnown.py b/src/linkaheadadvancedtools/suppressKnown.py index c4b57039c5184f2443e4dbb91cf11f5e59ae6790..a82ae4254d9dc3d8f15b1497c44932fd696d282b 100644 --- a/src/linkaheadadvancedtools/suppressKnown.py +++ b/src/linkaheadadvancedtools/suppressKnown.py @@ -29,7 +29,7 @@ class SuppressKnown(logging.Filter): self.db_file = db_file else: tmppath = tempfile.gettempdir() - tmpf = os.path.join(tmppath, "caosadvanced_suppressed_cache.db") + tmpf = os.path.join(tmppath, "linkaheadadvanced_suppressed_cache.db") self.db_file = tmpf if not os.path.exists(self.db_file): self.create_cache() diff --git a/src/linkaheadadvancedtools/table_importer.py b/src/linkaheadadvancedtools/table_importer.py index 8f793584051386796bce18bdbaded6c7e34c06ca..84f7ffa8c86b760221e0328aca141b8c81be5932 100755 --- a/src/linkaheadadvancedtools/table_importer.py +++ b/src/linkaheadadvancedtools/table_importer.py @@ -36,7 +36,7 @@ import numpy as np import pandas as pd from xlrd import XLRDError -from caosadvancedtools.utils import check_win_path +from linkaheadadvancedtools.utils import check_win_path from .datainconsistency import DataInconsistencyError from .suppressKnown import SuppressKnown