Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Requirements updates #2257

Merged
merged 4 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/forms-flow-api-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ jobs:
USE_DOCKER_MOCK: "True"

runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.12.6]

services:
postgres:
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/forms-flow-data-analysis-api-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

strategy:
matrix:
python-version: [3.11.10]
python-version: [3.12.6]

steps:
- uses: actions/checkout@v2
Expand All @@ -44,7 +44,7 @@ jobs:
id: pylint
run: |
pylint --rcfile=setup.cfg src/api
Test:
if: always()
needs: setup-job
Expand Down Expand Up @@ -72,6 +72,10 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.12.6]

services:
postgres:
image: postgres:13
Expand Down Expand Up @@ -104,7 +108,11 @@ jobs:
Build:
if: always()
runs-on: ubuntu-20.04
name: Build

strategy:
matrix:
python-version: [3.12.6]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/forms-flow-documents-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ jobs:
USE_DOCKER_MOCK: "True"

runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.12.6]

services:
postgres:
Expand Down
92 changes: 48 additions & 44 deletions forms-flow-api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,71 +1,75 @@
Brotli==1.1.0
Flask-Caching==2.1.0
Flask-Caching==2.0.1
Flask-Migrate==4.0.7
Flask-Moment==1.0.5
Flask-Moment==1.0.6
Flask-SQLAlchemy==3.1.1
Flask==2.3.3
Jinja2==3.1.3
Mako==1.3.2
MarkupSafe==2.1.5
PyJWT==2.8.0
Jinja2==3.1.4
Mako==1.3.5
MarkupSafe==3.0.1
PyJWT==2.9.0
PySocks==1.7.1
SQLAlchemy-Utils==0.41.1
SQLAlchemy==2.0.28
Werkzeug==3.0.1
alembic==1.13.1
SQLAlchemy-Utils==0.41.2
SQLAlchemy==2.0.35
Werkzeug==3.0.4
alembic==1.13.3
aniso8601==9.0.1
async-timeout==4.0.3
attrs==23.2.0
blinker==1.7.0
cachelib==0.9.0
certifi==2024.2.2
cffi==1.16.0
attrs==24.2.0
blinker==1.8.2
cachelib==0.13.0
certifi==2024.8.30
cffi==1.17.1
charset-normalizer==3.3.2
click==8.1.7
cryptography==42.0.5
ecdsa==0.18.0
flask-jwt-oidc==0.3.0
cryptography==43.0.1
ecdsa==0.19.0
exceptiongroup==1.2.2
flask-jwt-oidc==0.7.0
flask-marshmallow==1.2.1
flask-restx==1.3.0
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@develop#subdirectory=forms-flow-api-utils
gunicorn==21.2.0
formsflow_api_utils @ git+https://github.com/AOT-Technologies/forms-flow-ai.git@develop#subdirectory=forms-flow-api-utils
gunicorn==23.0.0
h11==0.14.0
h2==4.1.0
hpack==4.0.0
hyperframe==6.0.1
idna==3.6
importlib_resources==6.3.2
itsdangerous==2.1.2
jsonschema-specifications==2023.12.1
jsonschema==4.21.1
idna==3.10
importlib_metadata==8.5.0
importlib_resources==6.4.5
itsdangerous==2.2.0
jsonschema-specifications==2024.10.1
jsonschema==4.23.0
kaitaistruct==0.10
marshmallow-sqlalchemy==1.0.0
marshmallow==3.21.1
lxml==5.3.0
marshmallow-sqlalchemy==1.1.0
marshmallow==3.22.0
outcome==1.3.0.post0
packaging==24.0
packaging==24.1
psycopg2-binary==2.9.9
pyOpenSSL==24.1.0
pyasn1==0.5.1
pycparser==2.21
pyparsing==3.1.2
pyOpenSSL==24.2.1
pyasn1==0.6.1
pycparser==2.22
pyparsing==3.1.4
python-dotenv==1.0.1
python-jose==3.3.0
pytz==2024.1
redis==5.0.5
referencing==0.34.0
requests==2.31.0
rpds-py==0.18.0
pytz==2024.2
redis==5.1.1
referencing==0.35.1
requests==2.32.3
rpds-py==0.20.0
rsa==4.9
selenium-wire==5.1.0
selenium==4.19.0
sentry-sdk==1.43.0
selenium==4.25.0
sentry-sdk==2.16.0
six==1.16.0
sniffio==1.3.1
sortedcontainers==2.4.0
trio-websocket==0.11.1
trio==0.25.0
typing_extensions==4.10.0
urllib3==2.2.1
trio==0.26.2
typing_extensions==4.12.2
urllib3==2.2.3
websocket-client==1.8.0
wsproto==1.2.0
zstandard==0.22.0
lxml==5.3.0
zipp==3.20.2
zstandard==0.23.0
4 changes: 2 additions & 2 deletions forms-flow-api/requirements/prod.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
gunicorn
Flask<3
Flask
Flask-Caching
Flask-Migrate
Flask-Moment
Flask-SQLAlchemy
flask-restx
flask-marshmallow
flask-jwt-oidc
flask-jwt-oidc==0.7.0
python-dotenv
psycopg2-binary
marshmallow-sqlalchemy
Expand Down
49 changes: 35 additions & 14 deletions forms-flow-data-analysis-api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,85 @@ Flask-SQLAlchemy==3.1.1
Flask==3.0.3
Jinja2==3.1.4
Mako==1.3.5
MarkupSafe==2.1.5
PyYAML==6.0.1
MarkupSafe==3.0.1
PyYAML==6.0.2
Pygments==2.18.0
SQLAlchemy-Utils==0.41.2
SQLAlchemy==2.0.35
Werkzeug==3.0.3
Werkzeug==3.0.4
alembic==1.13.3
aniso8601==9.0.1
annotated-types==0.7.0
attrs==24.2.0
blinker==1.8.2
blis==0.7.11
blis==1.0.1
cachelib==0.13.0
catalogue==2.0.10
certifi==2024.8.30
charset-normalizer==3.3.2
click==8.1.7
cloudpathlib==0.19.0
confection==0.1.5
cymem==2.0.8
ecdsa==0.19.0
filelock==3.16.1
flask-jwt-oidc==0.7.0
flask-restx==1.3.0
fsspec==2024.9.0
gunicorn==22.0.0
gunicorn==23.0.0
huggingface-hub==0.25.1
idna==3.10
importlib_metadata==8.5.0
importlib_resources==6.4.5
itsdangerous==2.2.0
joblib==1.4.2
jsonschema-specifications==2023.7.1
jsonschema-specifications==2024.10.1
jsonschema==4.23.0
langcodes==3.4.1
language_data==1.2.0
marisa-trie==1.2.0
markdown-it-py==3.0.0
mdurl==0.1.2
mpmath==1.3.0
murmurhash==1.0.10
networkx==3.3
nltk==3.9
numpy==1.26.4
networkx==3.2.1
nltk==3.9.1
numpy==2.0.2
packaging==24.1
plac==1.4.3
preshed==3.0.9
protobuf==5.28.2
psycopg2-binary==2.9.9
pyasn1==0.6.1
pydantic==2.9.2
pydantic_core==2.23.4
python-dotenv==1.0.1
python-jose==3.3.0
pytz==2024.2
referencing==0.30.2
referencing==0.35.1
regex==2024.9.11
requests==2.32.3
rich==13.9.2
rpds-py==0.20.0
rsa==4.9
safetensors==0.4.5
sentencepiece==0.2.0
shellingham==1.5.4
six==1.16.0
spacy==3.7.6
smart-open==7.0.5
spacy-legacy==3.0.12
spacy-loggers==1.0.5
spacy==3.8.2
srsly==2.4.8
sympy==1.13.3
thinc==8.2.5
thinc==8.3.2
tokenizers==0.20.0
torch==2.4.1
tqdm==4.66.5
transformers==4.45.1
transformers==4.45.2
typer==0.12.5
typing_extensions==4.12.2
urllib3==2.2.3
wasabi==1.1.3
weasel==0.4.1
wrapt==1.16.0
zipp==3.20.2
4 changes: 2 additions & 2 deletions forms-flow-data-analysis-api/requirements/prod.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gunicorn
Flask<3
Flask
Flask-SQLAlchemy
flask-restx
flask-jwt-oidc
Expand All @@ -10,6 +10,6 @@ attrs
Werkzeug
sqlalchemy_utils
sqlalchemy
spacy<3
spacy
nltk
Flask-Migrate
2 changes: 1 addition & 1 deletion forms-flow-data-analysis-api/src/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from .resources import data_analysis_api
from .utils.auth import jwt
from .utils.enumerator import Service
from .utils.logging import setup_logging
from .utils.file_log_handler import register_log_handlers
from .utils.logging import setup_logging

flask_logger = setup_logging(
os.path.join(os.path.abspath(os.path.dirname(__file__)), "logging.conf")
Expand Down
1 change: 1 addition & 0 deletions forms-flow-data-analysis-api/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from flask_migrate import Migrate, upgrade
from sqlalchemy import event, text
from sqlalchemy.schema import DropConstraint, MetaData

from api import create_app, setup_jwt_manager
from api.models import db as _db
from api.utils import jwt as _jwt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
from tests.utilities.base_test import (
get_sentiment_analysis_api_payload,
get_token
)
from tests.utilities.base_test import get_sentiment_analysis_api_payload, get_token


def test_sentiment_analysis_api_without_bearer_token(client):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
Test-suite
"""
from api.services.transformers import (
sentiment_analysis_pipeline_transformers

)
from api.services.transformers import sentiment_analysis_pipeline_transformers


def sentiment_analysis_pipeline_transformers():
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"""Utils for Test Suite"""
import ast
import os
import time

import requests
import time
from dotenv import find_dotenv, load_dotenv
from flask import current_app

Expand Down
Loading
Loading