data_pipeline_api 0.7.7__tar.gz → 0.7.9__tar.gz

{data_pipeline_api-0.7.7 → data_pipeline_api-0.7.9}/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.1
 Name: data-pipeline-api
-Version: 0.7.7
+Version: 0.7.9
 Summary: Python api to interact with the Fair Data Pipeline
 Home-page: https://www.fairdatapipeline.org/
 License: GNU General Public License v3.0
 Keywords: FAIR Data Pipeline,FAIR,Data Management,Provenance
 Author: Ryan J Field
 Author-email: ryan.field@glasgow.ac.uk
-Requires-Python: >=3.7.1,<3.11
+Requires-Python: >=3.7.1,<4.0.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: h5py (>=3.6.0,<4.0.0)
 Requires-Dist: matplotlib (>=3.5.1,<4.0.0)

{data_pipeline_api-0.7.7 → data_pipeline_api-0.7.9}/data_pipeline_api/pipeline.py

@@ -156,23 +156,33 @@ def initialise(token: str, config: str, script: str) -> dict:
     _ = config_storageroot_id
     script_hash = fdp_utils.get_file_hash(script)
 
-    # Create Script Storage Location
-    script_storage_data = {
-        "path": script.replace(run_metadata["write_data_store"], ""),
-        "hash": script_hash,
-        "public": True,
-        "storage_root": script_storageroot_url,
-    }
-
-    script_location_response = fdp_utils.post_entry(
-        token=token,
-        url=registry_url,
-        endpoint="storage_location",
-        data=script_storage_data,
-        api_version=api_version,
+    script_location_exists = fdp_utils.get_entry(
+        registry_url,
+        "storage_location",
+        query={
+            "hash": script_hash
+        }
     )
+    if script_location_exists:
+        script_location_url = script_location_exists[0]["url"]
+    else:
+        # Create Script Storage Location
+        script_storage_data = {
+            "path": script.replace(run_metadata["write_data_store"], ""),
+            "hash": script_hash,
+            "public": True,
+            "storage_root": script_storageroot_url,
+        }
+
+        script_location_response = fdp_utils.post_entry(
+            token=token,
+            url=registry_url,
+            endpoint="storage_location",
+            data=script_storage_data,
+            api_version=api_version,
+        )
 
-    script_location_url = script_location_response["url"]
+        script_location_url = script_location_response["url"]
     script_file_type = os.path.basename(script).split(".")[-1]
 
     # TODO: Change to Batch?

{data_pipeline_api-0.7.7 → data_pipeline_api-0.7.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "data_pipeline_api"
-version = "0.7.7"
+version = "0.7.9"
 description = "Python api to interact with the Fair Data Pipeline"
 authors = [
     "Ryan J Field <ryan.field@glasgow.ac.uk>",
@@ -31,7 +31,7 @@ keywords = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.7.1,<3.11"
+python = "^3.7.1,<4.0"
 requests = "^2.27.1"
 matplotlib = "^3.5.1"
 scipy = "^1.7.3"

data_pipeline_api-0.7.7/setup.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['data_pipeline_api', 'data_pipeline_api.ext']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['PyYAML>=6.0,<7.0',
- 'h5py>=3.6.0,<4.0.0',
- 'matplotlib>=3.5.1,<4.0.0',
- 'requests>=2.27.1,<3.0.0',
- 'scipy>=1.7.3,<2.0.0']
-
-setup_kwargs = {
-    'name': 'data-pipeline-api',
-    'version': '0.7.7',
-    'description': 'Python api to interact with the Fair Data Pipeline',
-    'long_description': "# pyDataPipeline\n\n[![pyDataPipeline](https://github.com/FAIRDataPipeline/pyDataPipeline/actions/workflows/pyDataPipeline.yaml/badge.svg?branch=dev)](https://github.com/FAIRDataPipeline/pyDataPipeline/actions/workflows/pyDataPipeline.yaml)\n[![codecov](https://codecov.io/gh/FAIRDataPipeline/pyDataPipeline/branch/dev/graph/badge.svg?token=Eax5AmrDxx)](https://codecov.io/gh/FAIRDataPipeline/pyDataPipeline)\n[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5562602.svg)](https://doi.org/10.5281/zenodo.5562602)\n[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5461/badge)](https://bestpractices.coreinfrastructure.org/projects/5461)\n\nWelcome to pyDataPipeline a Python api to interact with the Fair Data Pipeline.\n\nFull documention of the pyDataPipeline is avaialable at [https://www.fairdatapipeline.org/pyDataPipeline/](https://www.fairdatapipeline.org/pyDataPipeline/)\n\n## Installation\npyDataPipeline can be installed from PyPi:\n```\npip3 install data-pipeline-api\n```\n\nOr from the Repository:\n```\ngit clone https://github.com/FAIRDataPipeline/pythonFDP.git\n\ngit checkout dev\n\npip3 install -e .\n```\n**NB. PyDataPipeline requires Python3.**\n\n## Example submission_script\n\nAssume FDP_CONFIG_DIR, storage_locations and objects have been set by CLI tool\n\n```\nimport os\nimport fairdatapipeline as pipeline\n\ntoken = os.environ['FDP_LOCAL_TOKEN']\nconfig_dir = os.environ['FDP_CONFIG_DIR']\nconfig_path = os.path.join(config_dir, 'config.yaml')\nscript_path = os.path.join(config_dir, 'script.sh')\n\nhandle = pipeline.initialise(token, config_path, script_path)\n\npipeline.finalise(token, handle)\n\n```\n\n## SEIRS Model Example\n\nThe SEIRS Model Example is available at: [https://www.fairdatapipeline.org/pyDataPipeline/examples/SEIRS.html](https://www.fairdatapipeline.org/pyDataPipeline/examples/SEIRS.html)\n",
-    'author': 'Ryan J Field',
-    'author_email': 'ryan.field@glasgow.ac.uk',
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': 'https://www.fairdatapipeline.org/',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'python_requires': '>=3.7.1,<3.11',
-}
-
-
-setup(**setup_kwargs)