Merge pull request #5 from TatraDev/use_case

Use case added

Author: amprix

main.py

@@ -1,20 +1,50 @@
-from piper.services import TestMessageAdder, StringValue
-from piper.envs import CurrentEnv
-
+from piper.services import TestMessageAdder, StringValue, TesseractRecognizer, SpacyNER
+from piper.envs import CurrentEnv, DockerEnv
+from piper.configurations import get_configuration
+import time
 import asyncio
+import sys
+from piper.utils import tesrct_utils as tu
+
 from loguru import logger
-logger.add("file.log", level="INFO")
+logger.add("file.log", level="INFO", backtrace=True, diagnose=True, rotation='5 MB')
 
 if __name__ == '__main__':
+    # cfg = get_configuration()
+    # loop = asyncio.get_event_loop()
+    # with CurrentEnv() as env:
+    #     x = StringValue(value="hello, world")
+    #     adder = TestMessageAdder(appender="!", port=cfg.docker_app_port)
+    #     result = loop.run_until_complete(adder(x))
+    #     print(result)
+
+    # x = StringValue(value="hello, world") 
+    # adder = TestMessageAdder(appender="!", port=cfg.docker_app_port)
+    # result = loop.run_until_complete(adder(x))
+    # print(result)
+    # adder.rm_container()
+
+    logger.info(f'main here {time.time()}')
+    cfg = get_configuration()
     loop = asyncio.get_event_loop()
-    with CurrentEnv() as env:
-        x = StringValue(value="hello, world")
-        adder = TestMessageAdder(appender="!", port=8788)
-        result = loop.run_until_complete(adder(x))
-        print(result)
+    with DockerEnv() as env:
+        # object created
+        recognizer = TesseractRecognizer(port=cfg.docker_app_port)
+        
+        result = loop.run_until_complete(recognizer())
+        logger.info(f'result of recognition is {result}')
+
+        # sys.exit()
 
-    x = StringValue(value="hello, world")
-    adder = TestMessageAdder(appender="!", port=8788)
-    result = loop.run_until_complete(adder(x))
-    print(result)
-    adder.rm_container()
+        # sn = SpacyNER()
+        # txt = 'The Alraigo Incident occurred on 6th June 1983, when a lost British Royal Navy Sea Harrier fighter aircraft landed on the deck of a Spanish container ship.[1][2] Its pilot, Sub-lieutenant Ian Watson, was a junior Royal Navy Pilot undertaking his first NATO exercise from HMS Illustrious, which was operating off the coast of Portugal. Watson was launched in a pair of aircraft tasked with locating a French aircraft carrier under combat conditions including radio-silence and radar switched off.'
+        # # switch models
+        # for avalable_model in sn.available_models:
+        #     logger.info(f'current model is {avalable_model}')
+        #     sn.set_model(avalable_model)
+        #     result1 = sn.extract_named_ents(txt)
+        #     if result1:
+        #         result1_str = "\n".join(str(x) for x in result1)
+        #         logger.info(f'result of NER for model {avalable_model} is {result1_str}')
+        #     else:
+        #         logger.info(f'module didn`t get NER data')

piper/base/backend/templates/fast-api-tsrct.j2

@@ -0,0 +1,84 @@
+import time
+
+from fastapi import FastAPI, Request, status, File, UploadFile, HTTPException
+from piper.envs import CurrentEnv
+from loguru import logger
+from pathlib import Path
+#logger = logging.getLogger(__name__)
+
+#logger.add("file.log", level="INFO", backtrace=True, diagnose=True, rotation='5 MB')
+
+{% for script_name in scripts.keys() %}
+from {{ script_name }} import *
+{% endfor %}
+
+app = FastAPI(debug=True)
+app.logger = logger
+logger.info(f'main here {time.time()}')
+logger.info(f'Tesseract executor')
+
+@app.post('/health_check', status_code=status.HTTP_200_OK)
+async def health_check():
+    logger.info('health_check request')
+    return {"message": "health check"}
+
+with CurrentEnv():
+    logger.info(f'CurrentEnv')
+    service = {{ service_class }}( {% for k, v in service_kwargs.items() %} {{ k }}={{ v }}, {% endfor %} )
+    logger.info(f'service {service}')
+
+    sn = SpacyNER()
+    logger.info(f'SpacyNER created {sn}')
+
+    @app.post('/{{ function_name }}')
+    async def {{ function_name }}(file: UploadFile = File(...)):
+        try:
+            suf = Path(file.filename).suffix[1:].lower()
+            logger.info(f'recived file {file.filename}, suffix is {suf}')
+            content = await file.read()
+            result = await service.{{ function_name }}(content, suf)
+            return result
+        except Exception as e:
+            logger.error(f'error while parsing File object {e}')
+
+
+    @app.post('/set_config')
+    async def set_config(request: Request):
+        conf = await request.json()
+        logger.info(f'recived config dict {conf}')
+        try:
+            result = await service.sconfig(conf)
+            return result
+        except Exception as e:
+            logger.error(f'error while set config {e}')
+
+    @app.get('/get_ner_models')
+    async def get_ner_models():
+        return {'available_models': sn.available_models}
+
+    @app.post('/set_ner_model')
+    async def set_ner_model(request: Request):
+        model_name = await request.json()
+        try:
+            model_name = model_name.get('model_name')
+            sn.set_model(model_name)
+            return {'message': f'spacy ner model is {model_name} now'}        
+
+        except ValueError as ve:
+            raise HTTPException(status_code = 400, detail=f'Exception is {ve}')
+
+        except Exception as e:
+            logger.error(f'error while set config {e}')
+            logger.error('return HTTPException object')
+            raise HTTPException(status_code = 500, detail=f'Exception is {e}')
+
+    @app.get('/extract_named_ents')
+    async def extract_named_ents(request: Request):
+        txt = await request.json()
+        try:
+            txt = txt.get('txt')
+            result = sn.extract_named_ents(txt)  
+            return {'result': result}
+        
+        except Exception as e:
+            logger.error(f'error while set config {e}')          

piper/base/backend/templates/fast-api.j2

@@ -10,7 +10,7 @@ from {{ script_name }} import *
 app = FastAPI(debug=True)
 
 @app.post('/health_check', status_code = status.HTTP_200_OK)
-async def hl():
+async def health_check():
     return {"message": "health check"}
 
 with CurrentEnv():

piper/base/backend/utils.py

@@ -6,11 +6,27 @@ def render_fast_api_backend(**kwargs):
     """
     Render backend template to app.py
     """
-    print(os.path.dirname(__file__))
-    template_dir = os.path.join(os.path.dirname(__file__), 'templates/')
-    jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_dir),
-                                   trim_blocks=True,
-                                   lstrip_blocks=True)
-    print(jinja_env.list_templates())
-    template = jinja_env.get_template('fast-api.j2')
+    template = get_backend_template('fast-api.j2')
+    return template.render(**kwargs)
+
+
+def render_fast_api_tsrct_backend(**kwargs):
+    """
+    Render backend tesseract template to app.py
+    """
+    template = get_backend_template('fast-api-tsrct.j2')
     return template.render(**kwargs)
+
+
+def get_backend_template(template_fn):
+    """
+    Returns template data for j2 file
+    """
+    template_dir = os.path.join(os.path.dirname(__file__), 'templates/')
+    jinja_env = jinja2.Environment(
+        loader=jinja2.FileSystemLoader(template_dir),
+        trim_blocks=True,
+        lstrip_blocks=True
+    )
+    template = jinja_env.get_template(template_fn)
+    return template

piper/base/docker/__init__.py

@@ -4,10 +4,13 @@
 
 class PythonImage:
 
-    def __init__(self, tag, python_docker_version, cmd):
+    def __init__(self, tag, python_docker_version, cmd, template_file, run_rows, post_install_lines):
         self.tag = tag
         self.python_docker_version = python_docker_version
         self.cmd = cmd
+        self.template_file = template_file
+        self.run_rows = run_rows
+        self.post_install_lines = post_install_lines
 
     def render(self):
         """
@@ -17,5 +20,25 @@ def render(self):
         jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_dir),
                                        trim_blocks=True,
                                        lstrip_blocks=True)
-        template = jinja_env.get_template('default-python.j2')
-        return template.render(cmd=self.cmd, python_docker_version=self.python_docker_version)
+        template = jinja_env.get_template(self.template_file)
+        return template.render(cmd=self.cmd, python_docker_version=self.python_docker_version, run_command_lines=self.run_rows, post_install_lines=self.post_install_lines)
+
+
+# class PythonTesseractImage:
+
+#     def __init__(self, tag, python_docker_version, cmd):
+#         self.tag = tag
+#         self.python_docker_version = python_docker_version
+#         self.cmd = cmd
+
+
+#     def render(self):
+#         """
+#         Render docker template
+#         """
+#         template_dir = os.path.join(os.path.dirname(__file__), 'images')
+#         jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_dir),
+#                                        trim_blocks=True,
+#                                        lstrip_blocks=True)
+#         template = jinja_env.get_template('python-tesrct.j2')
+#         return template.render(cmd=self.cmd, python_docker_version=self.python_docker_version, run_command_lines=self.run_command_lines)

piper/base/docker/images/default-python.j2

@@ -1,10 +1,14 @@
 FROM python:{{ python_docker_version }}
 
+{{ run_command_lines }}
+
 WORKDIR /app
 
 COPY requirements.txt ./requirements.txt
 RUN pip3 install -r requirements.txt
 
+{{ post_install_lines }}
+
 COPY ./ ./
 RUN chmod +x ./run.sh