Merge branch 'main' into multichain

oceanprotocol · Mar 10, 2023 · 3bb5f06 · 3bb5f06
2 parents f8801ba + 33bd03a
commit 3bb5f06
Show file tree

Hide file tree

Showing 84 changed files with 343 additions and 182 deletions.
diff --git a/.copyright.tmpl b/.copyright.tmpl
@@ -1,2 +1,2 @@
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2023 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2023 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 name: black

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2023 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 name: Provider tests
@@ -46,13 +46,14 @@ jobs:
             sleep 10
             [ -f "$HOME/.ocean/ocean-contracts/artifacts/ready" -a -f "$HOME/.ocean/ocean-c2d/ready" ] && break
             done
+
       - name: Test with pytest
         run: |
           coverage run --source ocean_provider -m pytest
           coverage report
           coverage xml
       - name:  docker logs
-        run: docker logs ocean_aquarius_1 && docker logs ocean_provider_1 && docker logs ocean_provider2_1 && docker logs ocean_computetodata_1
+        run: docker logs ocean_aquarius_1 && docker logs ocean_provider_1 && docker logs ocean_provider2_1
         if: ${{ failure() }}
       - name: Publish code coverage
         uses: paambaati/[email protected]

diff --git a/API.md b/API.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2023 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2021 Ocean Protocol Foundation
+Copyright 2023 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 History

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2023 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 FROM ubuntu:18.04

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!--
-Copyright 2022 Ocean Protocol Foundation
+Copyright 2023 Ocean Protocol Foundation
 SPDX-License-Identifier: Apache-2.0
 -->
 [![banner](https://raw.githubusercontent.com/oceanprotocol/art/master/github/repo-banner%402x.png)](https://oceanprotocol.com)

diff --git a/bumpversion.sh b/bumpversion.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2023 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 

diff --git a/conftest.py b/conftest.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2023 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 version: '3'

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2023 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 

diff --git a/logging.yaml b/logging.yaml
@@ -1,5 +1,5 @@
 ##
-## Copyright 2021 Ocean Protocol Foundation
+## Copyright 2023 Ocean Protocol Foundation
 ## SPDX-License-Identifier: Apache-2.0
 ##
 version: 1

diff --git a/ocean_provider/__init__.py b/ocean_provider/__init__.py
@@ -1,4 +1,4 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
diff --git a/ocean_provider/constants.py b/ocean_provider/constants.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 

diff --git a/ocean_provider/exceptions.py b/ocean_provider/exceptions.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 

diff --git a/ocean_provider/file_types/definitions.py b/ocean_provider/file_types/definitions.py
@@ -110,28 +110,6 @@ def check_details(self, with_checksum=False):
         return False, {}
 
     def _get_result_from_url(self, with_checksum=False):
-        lightweight_methods = [] if self.method == "post" else ["head", "options"]
-        # if checksum is not needed, try with head/options, mabye we are lucky
-        if not with_checksum:
-            for method in lightweight_methods:
-                url = self.get_download_url()
-                func = getattr(requests, method)
-                result = func(
-                    url,
-                    timeout=REQUEST_TIMEOUT,
-                    headers=self.headers,
-                    params=self.format_userdata(),
-                )
-                if (
-                    result.status_code == 200
-                    and (
-                        result.headers.get("Content-Type")
-                        or result.headers.get("Content-Range")
-                    )
-                    and result.headers.get("Content-Length")
-                ):
-                    return result, {}
-
         func, func_args = self._get_func_and_args()
 
         # overwrite checksum flag if file is too large
@@ -154,7 +132,6 @@ def _get_result_from_url(self, with_checksum=False):
                     with_checksum = False
 
         if not with_checksum:
-            # fallback on full request, since head and options did not work
             return func(**func_args), {}
 
         sha = hashlib.sha256()

diff --git a/ocean_provider/http_provider.py b/ocean_provider/http_provider.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 from typing import Any, Dict

diff --git a/ocean_provider/log.py b/ocean_provider/log.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 

diff --git a/ocean_provider/models.py b/ocean_provider/models.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 from sqlalchemy import Column, String

diff --git a/ocean_provider/myapp.py b/ocean_provider/myapp.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 

diff --git a/ocean_provider/requests_session.py b/ocean_provider/requests_session.py
@@ -1,8 +1,8 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
-from requests.adapters import HTTPAdapter
+from requests.adapters import HTTPAdapter, Retry
 from requests.sessions import Session
 
 
@@ -13,16 +13,17 @@ def get_requests_session() -> Session:
     :return: requests session
     """
     session = Session()
+    retries = Retry(total=5, backoff_factor=1, status_forcelist=[502, 503, 504])
     session.mount(
         "http://",
         HTTPAdapter(
-            pool_connections=25, pool_maxsize=25, pool_block=True, max_retries=1
+            pool_connections=25, pool_maxsize=25, pool_block=True, max_retries=retries
         ),
     )
     session.mount(
         "https://",
         HTTPAdapter(
-            pool_connections=25, pool_maxsize=25, pool_block=True, max_retries=1
+            pool_connections=25, pool_maxsize=25, pool_block=True, max_retries=retries
         ),
     )
     return session
diff --git a/ocean_provider/routes/__init__.py b/ocean_provider/routes/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 """Unites routes from compute and consume files."""

diff --git a/ocean_provider/routes/auth.py b/ocean_provider/routes/auth.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import logging
@@ -34,7 +34,7 @@ def create_auth_token():
     (expiration date is in the future), the same token is re-enabled.
     ---
     tags:
-      - services
+      - auth
     consumes:
       - application/json
     parameters:
@@ -85,7 +85,7 @@ def delete_auth_token():
     disallowing API calls with that token.
     ---
     tags:
-      - services
+      - auth
     consumes:
       - application/json
     parameters:

diff --git a/ocean_provider/routes/compute.py b/ocean_provider/routes/compute.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import functools
@@ -211,7 +211,7 @@ def computeDelete():
 
     ---
     tags:
-      - services
+      - compute
     consumes:
       - application/json
     parameters:
@@ -267,7 +267,7 @@ def computeStop():
 
     ---
     tags:
-      - services
+      - compute
     consumes:
       - application/json
     parameters:
@@ -328,7 +328,7 @@ def computeStatus():
 
     ---
     tags:
-      - services
+      - compute
     consumes:
       - application/json
     parameters:
@@ -383,7 +383,7 @@ def computeStart():
 
     ---
     tags:
-      - services
+      - compute
     consumes:
       - application/json
     parameters:
@@ -483,7 +483,7 @@ def computeResult():
 
     ---
     tags:
-      - services
+      - compute
     consumes:
       - application/json
     parameters:
@@ -560,7 +560,7 @@ def computeEnvironments():
 
     ---
     tags:
-      - services
+      - compute
     consumes:
       - application/json
 
@@ -581,6 +581,21 @@ def computeEnvironments():
 
 @services.route("/validateContainer", methods=["POST"])
 def validateContainer():
+    """Validate a c2d container json
+
+    ---
+    tags:
+      - compute
+    consumes:
+      - application/json
+
+    responses:
+      200:
+        description: Container is valid.
+      400:
+        description: Container is invalid.
+    return: error dict if container is invalid
+    """
     container = get_request_data(request)
     valid, messages = validate_container(container)
 

diff --git a/ocean_provider/routes/consume.py b/ocean_provider/routes/consume.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Ocean Protocol Foundation
+# Copyright 2023 Ocean Protocol Foundation
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
@@ -40,7 +40,24 @@
 @services.route("/nonce", methods=["GET"])
 @validate(NonceRequest)
 def nonce():
-    """Returns a decimal `nonce` for the given account address."""
+    """Returns a decimal `nonce` for the given account address.
+
+    ---
+    tags:
+      - consume
+    consumes:
+      - application/json
+    parameters:
+      - name: userAddress
+        description: The address of the account
+        required: true
+        type: string
+    responses:
+      200:
+        description: nonce returned
+
+    return: nonce for user address
+    """
     logger.info("nonce endpoint called")
     data = get_request_data(request)
     address = data.get("userAddress")
@@ -65,7 +82,7 @@ def fileinfo():
 
     ---
     tags:
-      - services
+      - consume
 
     responses:
       200:
@@ -137,6 +154,8 @@ def initialize():
     where the approval is given to the provider's ethereum account for
     the number of tokens required by the service.
 
+    tags:
+      - consume
     responses:
       400:
         description: One or more of the required attributes are missing or invalid.
@@ -253,7 +272,7 @@ def download():
 
     ---
     tags:
-      - services
+      - consume
     consumes:
       - application/json
     parameters: