Document api rebase

.gitignore

@@ -4,4 +4,4 @@ __pycache__/
 .vscode
 **/.env
 tmp
-**/log.txt
+**/log.txt

servers/app.Dockerfile

@@ -0,0 +1,18 @@
+FROM python:3.9
+RUN apt-get update && apt-get -y install qpdf poppler-utils && apt-get install -y build-essential libpoppler-cpp-dev pkg-config python-dev
+RUN apt -y install libpq-dev
+COPY tenant/requirements.txt .
+RUN pip3 install --upgrade pip
+RUN pip3 install -r requirements.txt
+RUN pip3 install psycopg2
+RUN git -C /root clone https://github.com/ShipSolver/flask-cognito-lib.git
+RUN pip3 install -e /root/flask-cognito-lib
+WORKDIR /opt/metadata-extraction
+ENV PYTHONPATH .
+EXPOSE 6767
+ENV aws_secret_access_key 0zGUnCc0XNGX5lAfoN88EPnycnuZ0bMOWWKEqine
+ENV aws_access_key_id AKIASPMMHOETWM2ETVWJ
+ENV AWS_REGION="us-east-1"
+ENV AWS_COGNITO_USER_POOL_ID="us-east-1_6AUY6LKPZ"
+ENV AWS_COGNITO_USER_POOL_CLIENT_ID="2vukbtukva3u0oh29lf32ghmkp"
+ENV AWS_COGNITO_DOMAIN="https://shipsolver-dev.auth.us-east-1.amazoncognito.com/"

servers/celery.Dockerfile

@@ -0,0 +1,17 @@
+FROM python:3.9
+RUN apt-get update && apt-get -y install qpdf poppler-utils && apt-get install -y build-essential libpoppler-cpp-dev pkg-config python-dev
+RUN apt -y install tesseract-ocr && apt -y install libtesseract-dev
+COPY tenant/requirements.txt .
+RUN pip3 install --upgrade pip
+RUN pip3 install -r requirements.txt
+RUN pip3 install psycopg2-binary
+RUN git -C /root clone https://github.com/ShipSolver/flask-cognito-lib.git
+RUN pip3 install -e /root/flask-cognito-lib
+WORKDIR /opt/metadata-extraction/tenant
+ENV PYTHONPATH ..
+ENV aws_secret_access_key 0zGUnCc0XNGX5lAfoN88EPnycnuZ0bMOWWKEqine
+ENV aws_access_key_id AKIASPMMHOETWM2ETVWJ
+ENV AWS_REGION="us-east-1"
+ENV AWS_COGNITO_USER_POOL_ID="us-east-1_6AUY6LKPZ"
+ENV AWS_COGNITO_USER_POOL_CLIENT_ID="2vukbtukva3u0oh29lf32ghmkp"
+ENV AWS_COGNITO_DOMAIN="https://shipsolver-dev.auth.us-east-1.amazoncognito.com/"

servers/tenant/docker-compose.yml → servers/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       dockerfile: celery.Dockerfile
     volumes:
       - .:/opt/metadata-extraction
-    command: celery -A __init__.client worker --loglevel=info -f celery.logs -Ofair -c 2
+    command: celery -A config.client worker --loglevel=info -f celery.logs -Ofair -c 2
     tty: true
   app:
     hostname: app.wlp.com
@@ -36,8 +36,8 @@ services:
       - .:/opt/metadata-extraction
     container_name: app01
     ports:
-      - "5000:5000"
-    command: python3 server/__init__.py
+      - "6767:6767"
+    command: python3 tenant/server.py
     tty: true
   flower:
     hostname: flower.wlp.com

extraction/app.py → servers/extraction/app.py

@@ -1,10 +1,12 @@
 import os
-# from multilingual_pdf2text.pdf2text import PDF2Text
-# from multilingual_pdf2text.models.document_model.document import Document
-# import pdfplumber
-# import extraction.extract as e
+from multilingual_pdf2text.pdf2text import PDF2Text
+from multilingual_pdf2text.models.document_model.document import Document
+import pdfplumber
+import extraction.extract as e
 import json
+from celery.utils.log import get_logger
 
+logger = get_logger(__name__)
 
 def read_pdfplumber(file_name):
     with pdfplumber.open(file_name) as pdf:
@@ -26,8 +28,9 @@ def work(folder_path):
 
     ml_page_text = list(content)[0]["text"]
     pp_text = read_pdfplumber(pdf_file)
-
-    extract_json = e.extract(ml_page_text, plumber_page=pp_text)
+    for i in range(14):
+        logger.info("WE HERE----------------")
+    extract_json = e.generate_doclist(e.extract(ml_page_text, plumber_page=pp_text))
 
     with open(f"{folder_path}/{pdf_uuid}.json", "w") as f:
         json.dump(extract_json, f, indent=2)

extraction/const.py → servers/extraction/const.py

@@ -6,30 +6,33 @@
 
 #doclist_keys
 
-HOUSE_REF = "house_ref"
-BARCODE = "barcode"
-FIRST_PARTY = "first_party"
-NUM_PCS = "num_pcs"
-PCS = "pcs"
+BARCODE = "barcodeNumber"
+HOUSE_REF = "houseReferenceNumber"
 WEIGHT = "weight"
+NUM_PCS = "claimedNumberOfPieces"
+BOL_NUM = "BOLNumber"
+SPECIAL_SERVICES = "specialServices"
+SPECIAL_INSTRUCTIONS = "specialInstructions"
+CONSIGNEE = "consignee"
+SHIPPER = "shipper"
+COMPANY = "Company"
+NAME = "Name"
+ADDRESS = "Address"
+POSTAL_CODE = "PostalCode"
+PHONE_NUMBER = "PhoneNumber"
+
+NO_SIGNATURE_REQUIRED = "noSignatureRequired"
+TAILGATE_AUTHORIZED = "tailgateAuthorized"
+
+FIRST_PARTY = "customerName"
+
+PCS = "pieces"
 
 PKG = "pkg"
-WT_LBS = "wt(lbs)"
+WT_LBS = "weight"
 COMMODITY_DESCRIPTION = "commodity_description"
 DIMS_IN = "dims(in)"
 
-BOL_NUM = "bol_num"
-SPECIAL_SERVICES = "special_services"
-SPECIAL_INSTRUCTIONS = "special_instructions"
-
-COMPANY = "company"
-NAME = "name"
-ADDRESS = "address"
-POSTAL_CODE = "postal_code"
-PHONE_NUMBER = "phone_number"
-
-CONSIGNEE = "consignee"
-SHIPPER = "shipper"
 
 CEVA_SHIPPER_FIELDS = [COMPANY, ADDRESS]
 CEVA_CONSIGNEE_FIELDS = [NAME, ADDRESS]

extraction/extract.py → servers/extraction/extract.py

@@ -271,25 +271,23 @@ def generate_doclist(_list):
         HOUSE_REF: _list[HOUSE_REF] if HOUSE_REF in _list else "",
         BARCODE: _list[BARCODE] if BARCODE in _list else "",
         PCS: _list[PCS] if PCS in _list else [],
-        NUM_PCS: _list[NUM_PCS] if NUM_PCS in _list else "",
+        NUM_PCS: _list[NUM_PCS] if NUM_PCS in _list else 0,
         WEIGHT: _list[WEIGHT] if WEIGHT in _list else "",
         BOL_NUM: _list[BOL_NUM] if BOL_NUM in _list else "",
         SPECIAL_SERVICES: _list[SPECIAL_SERVICES] if SPECIAL_SERVICES in _list else "",
         SPECIAL_INSTRUCTIONS: _list[SPECIAL_INSTRUCTIONS] if SPECIAL_INSTRUCTIONS in _list else "",
-        CONSIGNEE: {
-            COMPANY: _list[CONSIGNEE][COMPANY] if CONSIGNEE in _list and COMPANY in _list[CONSIGNEE] else "",
-            NAME: _list[CONSIGNEE][NAME] if CONSIGNEE in _list and NAME in _list[CONSIGNEE] else "",
-            ADDRESS: _list[CONSIGNEE][ADDRESS] if CONSIGNEE in _list and ADDRESS in _list[CONSIGNEE] else "",
-            POSTAL_CODE: _list[CONSIGNEE][POSTAL_CODE] if CONSIGNEE in _list and POSTAL_CODE in _list[CONSIGNEE] else "",
-            PHONE_NUMBER: _list[CONSIGNEE][PHONE_NUMBER] if CONSIGNEE in _list and PHONE_NUMBER in _list[CONSIGNEE] else ""
-        },
-        SHIPPER: {
-            COMPANY: _list[SHIPPER][COMPANY] if SHIPPER in _list and COMPANY in _list[SHIPPER] else "",
-            NAME: _list[SHIPPER][NAME] if SHIPPER in _list and NAME in _list[SHIPPER] else "",
-            ADDRESS: _list[SHIPPER][ADDRESS] if SHIPPER in _list and ADDRESS in _list[SHIPPER] else "",
-            POSTAL_CODE: _list[SHIPPER][POSTAL_CODE] if SHIPPER in _list and POSTAL_CODE in _list[SHIPPER] else "",
-            PHONE_NUMBER: _list[SHIPPER][PHONE_NUMBER] if SHIPPER in _list and PHONE_NUMBER in _list[SHIPPER] else ""
-        }
+        CONSIGNEE+COMPANY: _list[CONSIGNEE][COMPANY] if CONSIGNEE in _list and COMPANY in _list[CONSIGNEE] else "",
+        CONSIGNEE+NAME: _list[CONSIGNEE][NAME] if CONSIGNEE in _list and NAME in _list[CONSIGNEE] else "",
+        CONSIGNEE+ADDRESS: _list[CONSIGNEE][ADDRESS] if CONSIGNEE in _list and ADDRESS in _list[CONSIGNEE] else "",
+        CONSIGNEE+POSTAL_CODE: _list[CONSIGNEE][POSTAL_CODE] if CONSIGNEE in _list and POSTAL_CODE in _list[CONSIGNEE] else "",
+        CONSIGNEE+PHONE_NUMBER: _list[CONSIGNEE][PHONE_NUMBER] if CONSIGNEE in _list and PHONE_NUMBER in _list[CONSIGNEE] else "",
+        SHIPPER+COMPANY: _list[SHIPPER][COMPANY] if SHIPPER in _list and COMPANY in _list[SHIPPER] else "",
+        SHIPPER+NAME: _list[SHIPPER][NAME] if SHIPPER in _list and NAME in _list[SHIPPER] else "",
+        SHIPPER+ADDRESS: _list[SHIPPER][ADDRESS] if SHIPPER in _list and ADDRESS in _list[SHIPPER] else "",
+        SHIPPER+POSTAL_CODE: _list[SHIPPER][POSTAL_CODE] if SHIPPER in _list and POSTAL_CODE in _list[SHIPPER] else "",
+        SHIPPER+PHONE_NUMBER: _list[SHIPPER][PHONE_NUMBER] if SHIPPER in _list and PHONE_NUMBER in _list[SHIPPER] else "",
+        NO_SIGNATURE_REQUIRED: _list[NO_SIGNATURE_REQUIRED] if NO_SIGNATURE_REQUIRED in _list else False,     
+        TAILGATE_AUTHORIZED: _list[TAILGATE_AUTHORIZED] if TAILGATE_AUTHORIZED in _list else False    
     }