Update Dockerfile (#1010)

* Update Dockerfile
* Update header usage.
* Bump version: 5.1.1 → 5.1.2
* Update swagger example for logIndex.

Author: calina-c

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.1.1
+current_version = 5.1.2
 commit = True
 tag = True
 

Dockerfile

@@ -22,6 +22,8 @@ RUN pip install setuptools
 RUN pip install wheel
 RUN pip install .
 
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
+RUN update-alternatives --set python3 /usr/bin/python3.8
 
 ENV DB_MODULE='elasticsearch'
 ENV DB_HOSTNAME='localhost'

aquarius/__init__.py

@@ -9,5 +9,5 @@
 __author__ = """OceanProtocol"""
 # fmt: off
 # bumpversion needs single quotes
-__version__ = '5.1.1'
+__version__ = '5.1.2'
 # fmt: on

aquarius/app/assets.py

@@ -407,7 +407,7 @@ def trigger_caching():
               type: int
               required: false
               description: log index for the event in the transaction
-              example: 8996
+              example: 1
     responses:
       200:
         description: successful operation.

aquarius/events/http_provider.py

@@ -6,7 +6,6 @@
 
 from web3 import HTTPProvider, WebsocketProvider
 
-from aquarius.config import get_version
 from aquarius.events.request import make_post_request
 
 GANACHE_URL = "http://127.0.0.1:8545"
@@ -46,17 +45,15 @@ def make_request(self, method, params):
 
 
 def get_web3_connection_provider(network_url):
-    version = get_version()
-    request_kwargs = {"headers": {"User-Agent": f"OceanAquarius/{version}"}}
 
     if network_url.startswith("http"):
-        provider = CustomHTTPProvider(network_url, request_kwargs=request_kwargs)
+        provider = CustomHTTPProvider(network_url)
     elif network_url.startswith("ws"):
         provider = WebsocketProvider(network_url)
     elif network_url == "ganache":
-        provider = CustomHTTPProvider(GANACHE_URL, request_kwargs=request_kwargs)
+        provider = CustomHTTPProvider(GANACHE_URL)
     elif network_url == "polygon":
-        provider = CustomHTTPProvider(POLYGON_URL, request_kwargs=request_kwargs)
+        provider = CustomHTTPProvider(POLYGON_URL)
     else:
         assert network_url in SUPPORTED_NETWORK_NAMES, (
             f"The given network_url *{network_url}* does not start with either "

aquarius/events/request.py

@@ -11,6 +11,7 @@
 import requests
 from requests.adapters import HTTPAdapter
 from web3._utils.caching import generate_cache_key
+from aquarius.config import get_version
 
 
 def _remove_session(key, session):
@@ -40,6 +41,15 @@ def _get_session(*args, **kwargs):
 def make_post_request(endpoint_uri, data, *args, **kwargs):
     kwargs.setdefault("timeout", 10)
     session = _get_session(endpoint_uri)
+
+    version = get_version()
+    version_header = {"User-Agent": f"OceanAquarius/{version}"}
+
+    if "headers" in kwargs:
+        kwargs["headers"].update(version_header)
+    else:
+        kwargs["headers"] = version_header
+
     response = session.post(endpoint_uri, data=data, *args, **kwargs)
     response.raise_for_status()
 

setup.py

@@ -94,7 +94,7 @@
     url="https://github.com/oceanprotocol/aquarius",
     # fmt: off
     # bumpversion needs single quotes
-    version='5.1.1',
+    version='5.1.2',
     # fmt: on
     zip_safe=False,
 )