Merges pull request #3

Off of Amazon!!!

1 files changed, 31 insertions, 5 deletions

diff --git a/jb/decorators.py b/jb/decorators.py
index 5c1b1f5..9c7a31c 100644
--- a/jb/decorators.py
+++ b/jb/decorators.py
@@ -1,17 +1,20 @@
+import logging
+
 import boto3
 from botocore.config import Config
-from generalresearchutils.pg_helper import PostgresConfig
-from generalresearchutils.redis_helper import RedisConfig
+from generalresearch.managers.base import Permission
+from generalresearch.pg_helper import PostgresConfig
+from generalresearch.redis_helper import RedisConfig
 from influxdb import InfluxDBClient
 from mypy_boto3_mturk import MTurkClient
 from mypy_boto3_sns import SNSClient
 
 from jb.config import settings
-from jb.managers import Permission
 from jb.managers.amt import AMTManager
 from jb.managers.assignment import AssignmentManager
 from jb.managers.bonus import BonusManager
-from jb.managers.hit import HitTypeManager, HitManager, HitQuestionManager
+from jb.managers.gr_api import GRApiManager
+from jb.managers.hit import HitManager, HitQuestionManager, HitTypeManager
 
 redis_config = RedisConfig(
     dsn=settings.redis,
@@ -19,7 +22,24 @@ redis_config = RedisConfig(
     socket_timeout=settings.redis_timeout,
     socket_connect_timeout=settings.redis_timeout,
 )
-REDIS = redis_config.create_redis_client()
+
+
+def get_redis_config():
+    return redis_config
+
+
+def get_redis():
+    return redis_config.create_redis_client()
+
+
+# --- Logging ---
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(levelname)s:%(name)s:%(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
+LOG = logging.getLogger("amtjb")
 
 CLIENT_CONFIG = Config(
     # connect_timeout (float or int) – The time in seconds till a timeout
@@ -32,6 +52,12 @@ CLIENT_CONFIG = Config(
     read_timeout=2.5,
 )
 
+gr_api_manager = GRApiManager(
+    base_url=str(settings.gr_api_host),
+    token=settings.gr_api_token.get_secret_value(),
+    product_id=settings.product_id,
+)
+
 # We shouldn't use this directly. Use our AMTManager wrapper
 AMT_CLIENT: MTurkClient = boto3.client(
     service_name="mturk",