auth log, bb4g fix

bb4g/__init__.py

@@ -1,12 +1,13 @@
+import enum
 import json
+import logging
 import math
 from datetime import datetime
 from typing import List
-import enum
+
 import requests
 from django.conf import settings as s
 from envipy_additional_information import EnviPyModel, UIConfig, WidgetType
-from envipy_additional_information import register
 
 from bridge.contracts import Classifier  # noqa: I001
 from bridge.dto import (
@@ -17,6 +18,9 @@ from bridge.dto import (
     TransformationProductPrediction,
 )  # noqa: I001
 
+logger = logging.getLogger("epdb")
+
+
 class SamplingAlgorithm(enum.Enum):
     EXACT = "exact"
 
@@ -88,7 +92,7 @@ class BB4G(Classifier):
         retries = 0
         while not started and retries < 5:
             res = requests.post(f"{self.url}/start", headers=header, data={}, proxies=s.PROXIES or None)
-
+            logger.info(f"Starting BB4G: {res.status_code}")
             if res.status_code == 200:
                 started = True
             elif res.status_code in [500, 502]:
@@ -166,7 +170,17 @@ class BB4G(Classifier):
                 "cutoff": self.config.cutoff,
             }
 
-            resp = requests.post(f"{self.url}/compute", headers=header, data=json.dumps(data), proxies=s.PROXIES or None)
+            retries = 0
+            while retries < 5:
+                resp = requests.post(f"{self.url}/compute", headers=header, data=json.dumps(data),
+                                     proxies=s.PROXIES or None)
+
+                if resp.status_code == 418:
+                    retries += 1
+                    logger.info(f"BB4G predict hit a 418, retrying in 60 seconds")
+                    import time
+                    time.sleep(60)
+                    continue
 
                 resp.raise_for_status()
 
@@ -180,4 +194,6 @@ class BB4G(Classifier):
 
                     result[substrate] = preds
 
+                break
+
         return result

docker-compose.dev.yml

@@ -25,7 +25,7 @@ services:
       - ep_bayer_redis_data:/data
 
   biotransformer3:
-    image: envipath/biotransformer3:1.0
+    image: git.envipath.com/envipath/biotransformer3:1.0
     container_name: epbiotransformer3
 
 #  web:
@@ -40,7 +40,7 @@ services:
 #      - ep_bayer_data:/opt/enviPy/
 
   celery_worker:
-    image: envipath/envipy-bayer:1.0
+    image: git.envipath.com/envipath/envipy-bayer:1.0
     container_name: epcelery
     env_file:
       - .env.dev

envipath/settings.py

@@ -275,6 +275,12 @@ LOGGING = {
             "filename": os.path.join(LOG_DIR, "debug.log"),
             "formatter": "simple",
         },
+        "auth_file": {
+            "level": "INFO",  # Or higher
+            "class": "logging.FileHandler",
+            "filename": os.path.join(LOG_DIR, "auth.log"),
+            "formatter": "simple",
+        }
     },
     "loggers": {
         # For everything under epdb/ loaded via getlogger(__name__)
@@ -295,6 +301,11 @@ LOGGING = {
             "propagate": True,
             "level": os.environ.get("LOG_LEVEL", "INFO"),
         },
+        "auth": {
+            "handlers": ["auth_file"],
+            "propagate": True,
+            "level": os.environ.get("LOG_LEVEL", "INFO"),
+        }
     },
 }