Upgrade pyinfra (absolute FP support)

- Update pyinfra with absolute file path support (still supports
  dossierID fileID format)
- Update CI, use new template
This commit is contained in:
Julius Unverfehrt 2023-08-23 15:26:25 +02:00
parent 415d2b135b
commit efcd661948
4 changed files with 781 additions and 958 deletions

View File

@ -1,4 +1,8 @@
include:
- project: "Gitlab/gitlab"
ref: 0.2.3
file: "/ci-templates/research/red-dvc_versioning_build_gitlab-ci.yml"
ref: 0.2.6
file: "/ci-templates/research/dvc-versioning-build-release.gitlab-ci.yml"
variables:
NEXUS_PROJECT_DIR: red
IMAGENAME: "${CI_PROJECT_NAME}"

1719
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "cv-analysis-service"
version = "1.20.2"
version = "1.22.0"
description = ""
authors = []
readme = "README.md"
@ -26,7 +26,8 @@ dependency-check = "^0.6.0"
lorem-text = "^2.1"
PyMuPDF = "^1.19.6"
loguru = "^0.6.0"
pyinfra = { version = "1.5.9", source = "gitlab-research" }
pyinfra = { version = "1.6.0", source = "gitlab-research" }
kn-utils = { version = "0.1.4", source = "gitlab-research" }
pdf2img = { version = "0.6.1", source = "gitlab-red" }
dvc-azure = "^2.21.2"

View File

@ -1,11 +1,14 @@
import logging
from pyinfra.payload_processing.processor import make_payload_processor
from cv_analysis.config import get_config
from cv_analysis.server.pipeline import get_analysis_pipeline
from pyinfra import config as pyinfra_config
from pyinfra.payload_processing import make_payload_processor
from pyinfra.queue.queue_manager import QueueManager
from cv_analysis.utils.banner import make_art
PYINFRA_CONFIG = pyinfra_config.get_config()
CV_CONFIG = get_config()
@ -24,7 +27,7 @@ def make_dispatched_data_analysis(config):
def main():
logger.info("Application is starting")
logger.info(make_art())
process_data = make_dispatched_data_analysis(config=CV_CONFIG)
process_payload = make_payload_processor(process_data, config=PYINFRA_CONFIG)