Add support .env and add description in README.

Docker-compose.yml

@@ -4,15 +4,15 @@ services:
     build: .
     volumes:
       - ./:/app
-    command: gunicorn delivery_pdf.main:init -b :8500 --worker-class aiohttp.GunicornWebWorker --reload --access-logfile -
+    command: gunicorn delivery_pdf.main:init -b :${SERVER_PORT} --worker-class aiohttp.GunicornWebWorker --reload --access-logfile -
     ports:
-      - "8500:8500"
+      - "${SERVER_PORT}:${SERVER_PORT}"
     networks:
       - host
   athena:
     image: arachnysdocker/athenapdf-service:latest
     ports:
-      - "8080:8080"
+      - "${SERVICE_PORT}:${SERVICE_PORT}"
     networks:
       - host
 networks:

README.md

@@ -0,0 +1,22 @@
+ # PDF delivery
+
+The service consists of two microservices.
+ - handler html code and the initiator of the call processing html is written
+  in aiohttp
+ - simple, Docker-powered PDF conversions athena - read more [here](https://github.com/arachnys/athenapdf)
+
+ Which communicate with each other via http.
+
+# Build and run
+
+- Clone the repository to your computer.
+- Configure `example.env` and rename to `.env`.
+- From the root directory of the project, run the `docker build --tag=testconvertpdf .`
+- Start docker-compose `docker-compose up`
+- The service is ready to use.
+
+#How to use
+
+Any client make a post request to the address `0.0.0.0:8500` and pass any html.
+In response, you will receive a generated pdf.
+

delivery_pdf/main.py

@@ -1,19 +1,34 @@
+import os
+from pathlib import Path
+
 from aiohttp import web
+from dotenv import load_dotenv
 
-from .settings import config_t
 from .routes import setup_routes
 from .views import CreatePDF
 
 
+env_path = Path('.') / '.env'
+print(env_path)
+load_dotenv(dotenv_path=env_path)
+
+
 async def init(argv=None):
     app = web.Application()
-    server = config_t['server']
-    service = config_t['service']
+    server = {
+        'host': os.getenv('SERVER_HOST'),
+        'port': os.getenv('SERVER_PORT')
+    }
+    service = {
+        'host': os.getenv('SERVICE_HOST'),
+        'port': os.getenv('SERVICE_PORT')
+    }
     handler = CreatePDF(server, service)
     setup_routes(app, handler)
-    app['config'] = config_t['external']
-    # host = config_t['external']['host']
-    # port = config_t['external']['port']
+    app['config'] = {
+        'host': os.getenv('SERVICE_HOST'),
+        'port': os.getenv('SERVER_PORT'),
+    }
 
     return app
 

delivery_pdf/views.py

@@ -8,10 +8,10 @@ async def index(request):
 
 class CreatePDF:
 
-    def __init__(self, server, servise):
+    def __init__(self, server, service):
         self.uuid_dict = {}
         self.server = server
-        self.service = servise
+        self.service = service
         self.add_uuid = None
 
     def get_uuid(self):
@@ -23,10 +23,12 @@ async def fetch_pdf(self, uuid):
         host_server = self.server['host']
         port_server = self.server['port']
 
-        url = 'http://{}:{}/convert'.format(host_service, port_service)
-        url_server = 'http://{}:{}/raw/{}'.format(host_server, port_server, uuid)
+        url = 'http://{0}:{1}/convert'.format(host_service, port_service)
+        url_server = 'http://{0}:{1}/raw/{2}'.format(host_server, port_server, uuid)
         params = {'auth': 'arachnys-weaver', 'url': url_server}
-        timeout = ClientTimeout(total=6*60, connect=2*60, sock_connect=60, sock_read=60)
+        timeout = ClientTimeout(
+            total=6*60, connect=2*60, sock_connect=60, sock_read=60
+        )
         async with ClientSession(timeout=timeout) as session:
             async with session.get(url=url, params=params) as resp:
                 content = await resp.content.read()

example.env

@@ -0,0 +1,8 @@
+SERVER_HOST='aiohttp'
+SERVER_PORT=port for aiohttp
+
+SERVICE_HOST='athena'
+SERVICE_PORT='port for athena'
+
+EXTERNAL_HOST = '0.0.0.0'
+EXTERNAL_PORT = '8500'

setup.py

@@ -9,7 +9,9 @@
 
 def read_version():
 
-    init_py = os.path.join(os.path.dirname(__file__), 'delivery_pdf', '__init__.py')
+    init_py = os.path.join(
+        os.path.dirname(__file__), 'delivery_pdf', '__init__.py'
+    )
 
     with open(init_py) as f:
         for line in f:
@@ -23,9 +25,9 @@ def read_version():
 
 install_requires = [
     'aiohttp==3.5.4',
+    'python-dotenv',
     'toml',
     'requests',
-    'pyyaml',
     'gunicorn',
 ]