Improved threading to send requests to ethereum contract

rtrevinnoc · Feb 25, 2021 · 6cf7173 · 6cf7173
1 parent b74a342
commit 6cf7173
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 25 deletions.
diff --git a/Monad.py b/Monad.py
@@ -486,15 +486,19 @@ def inferLanguage(string: str) -> str:
     except:
         return "unk"
 
+
 def mintTokens(queryVec: np.array, answerVec: np.array) -> int:
-    if WEB3API.isConnected():
-        queryVec = (queryVec * 100).astype(int).tolist()
-        answerVec = (answerVec * 100).astype(int).tolist()
-        response = contract.functions.mint(queryVec, answerVec).call()
-        print("Tokens minted:", response)
-        return response
-    else:
-        raise "Cannot connect to Ethereum network."
+    try:
+        if WEB3API.isConnected():
+            queryVec = (queryVec * 100).astype(int).tolist()
+            answerVec = (answerVec * 100).astype(int).tolist()
+            response = contract.functions.mint(queryVec, answerVec).call()
+            print("Tokens minted:", response)
+            return response
+        else:
+            print("Cannot connect to Ethereum network.")
+    except:
+        print("The contract rejected the answer and did not award tokens.")
 
 
 class Monad():

diff --git a/future.py b/future.py
@@ -318,11 +318,12 @@ def loadMoreUrls(q_vec: np.ndarray, queryLanguage: str, numberOfURLs: int,
             "language": url["language"],
         } for url in search["results"]]
 
-        try:
-            minter_thread = threading.Thread(target=mintTokens, args=(q_vec, np.frombuffer(search["results"][0]["vec"], dtype=np.float32)))
-            minter_thread.start()
-        except:
-            print("The contract rejected the answer and did not award tokens.")
+        minter_thread = threading.Thread(target=mintTokens,
+                                         args=(q_vec,
+                                               np.frombuffer(
+                                                   search["results"][0]["vec"],
+                                                   dtype=np.float32)))
+        minter_thread.start()
 
         urlsInPreferedLanguage, urlsInOtherLanguages = [], []
         for url in urls:
@@ -359,11 +360,11 @@ def loadMoreImages(term: np.ndarray, number, page: int) -> dict:
                 image = bson.loads(
                     imageDBTransaction.get(str(image).encode("utf-8")))
                 if idx == 1:
-                    try:
-                        minter_thread = threading.Thread(target=mintTokens, args=(term, np.frombuffer(image["vec"], dtype=np.float32)))
-                        minter_thread.start()
-                    except:
-                        print("The contract rejected the answer and did not award tokens.")
+                    minter_thread = threading.Thread(
+                        target=mintTokens,
+                        args=(term,
+                              np.frombuffer(image["vec"], dtype=np.float32)))
+                    minter_thread.start()
                 resultImages.append({
                     "url": image["url"],
                     "parentUrl": image["parentUrl"]
@@ -406,14 +407,23 @@ def answer(query: str, page: int) -> jsonify:
     query = query.lower().strip()
     if queryLanguage != "en":
         try:
-            query = requests.get("https://www.apertium.org/apy/translate", params={'q': query, 'markUnknown': 'no', 'langpair': languagecodes.iso_639_alpha3(queryLanguage) + '|eng'}).json()['responseData']['translatedText']
+            query = requests.get(
+                "https://www.apertium.org/apy/translate",
+                params={
+                    'q':
+                    query,
+                    'markUnknown':
+                    'no',
+                    'langpair':
+                    languagecodes.iso_639_alpha3(queryLanguage) + '|eng'
+                }).json()['responseData']['translatedText']
         except:
             return {
-                    "answer": "Could not translate input.",
-                    "small_summary": "Could not translate input.",
-                    "corrected": query,
-                    "urls": []
-                    }
+                "answer": "Could not translate input.",
+                "small_summary": "Could not translate input.",
+                "corrected": query,
+                "urls": []
+            }
     try:
         q_vec = getSentenceMeanVector(query)
     except:
@@ -490,7 +500,6 @@ def answerImages(query: str, page: int) -> jsonify:
     except:
         minimumScore = 1
 
-
     listOfDataFromPeers = asyncio.run(
         getImagesFromPeers(query, q_vec, queryLanguage, numberOfURLs, page,
                            minimumScore))