fix: off url from env (#22)

* build: use uvicorn reload in dev
* fix: off url in env

.env

@@ -38,3 +38,4 @@ MEM_LIMIT=4294967296
 
 # on dev connect to the same network as off-server
 COMMON_NET_NAME=po_default
+OPENFOODFACTS_API_URL=http://world.openfoodfacts.localhost

Makefile

@@ -52,4 +52,4 @@ livecheck:
 
 build:
 	@echo "🥫 building docker (for dev)"
-	docker-compose build
+	docker-compose build

app/import_queue/product_client.py

@@ -6,17 +6,15 @@
 
 
 class ProductClient:
+
     def __init__(self):
-        pass
+        self.server_url = os.getenv(
+            'OPENFOODFACTS_API_URL',
+            'https://world.openfoodfacts.org',
+        )
 
     def get_product(self, code):
-        url = '{}/api/v2/product/{}'.format(
-            os.getenv(
-                'OPENFOODFACTS_API_URL',
-                'https://world.openfoodfacts.org',
-            ),
-            code,
-        )
+        url = f'{self.server_url}/api/v2/product/{code}'
         response = requests.get(url)
         json_response = response.json()
         if not json_response or not json_response.get('product'):

docker-compose.yml

@@ -77,6 +77,7 @@ services:
     environment:
       - ELASTICSEARCH_URL=es01:9200
       - REDIS_HOST=searchredis
+      - OPENFOODFACTS_API_URL
       # make it easier to run scripts
       - PYTHONPATH=/code
     ports:

docker/dev.yml

@@ -14,3 +14,4 @@ services:
     volumes:
       # mount code dynamically
       - "./app:/code/app"
+    command: ["uvicorn", "app.api:app", "--proxy-headers", "--host", "0.0.0.0", "--port", "8000", "--reload"]

docker/elasticvue-entrypoint.sh

@@ -48,4 +48,4 @@ then
     sed -i "/^ *access_log .*/r /tmp/nginx_snipet" $NGINX_CONF
 fi
 
-exec "$@"
+exec "$@"

docker/prod.yml

@@ -18,4 +18,4 @@ volumes:
 networks:
   common_net:
     name: ${COMMON_NET_NAME}
-    external: true
+    external: true