Bump tensorflow from 2.3.1 to 2.9.3

app/__init__.py

@@ -1,6 +1,6 @@
 # app/__init__.py
 
-from flask_restplus import Api
+from flask_restx import Api
 from flask import Blueprint
 
 from .main.controller.about_controller import api as about_ns

app/main/__init__.py

@@ -1,9 +1,9 @@
 from flask import Flask, url_for
 from flask_sqlalchemy import SQLAlchemy
 from flask_bcrypt import Bcrypt
-from flask_restplus import Api
+from flask_restx import Api
 from flask_migrate import Migrate
-from werkzeug.contrib.fixers import ProxyFix
+from werkzeug.middleware.proxy_fix import ProxyFix
 import pybrake.flask
 import logging
 from .config import config_by_name

app/main/controller/about_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 import json
 import numpy as np
 import sys

app/main/controller/article_controller.py

@@ -1,6 +1,6 @@
 import sys
 from flask import abort, request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from newspaper import Article
 from app.main import db
 from app.main.model.article import ArticleModel

app/main/controller/audio_similarity_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from app.main.lib.fields import JsonObject
 
 from app.main.lib import similarity

app/main/controller/audio_transcription_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 import boto3
 import botocore
 import requests

app/main/controller/bulk_similarity_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from elasticsearch import Elasticsearch
 from elasticsearch import helpers
 from app.main.lib.fields import JsonObject

app/main/controller/bulk_update_similarity_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from elasticsearch import Elasticsearch
 from elasticsearch import helpers
 from app.main.lib.fields import JsonObject

app/main/controller/graph_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from app.main.lib.fields import JsonObject
 import json
 import numpy as np

app/main/controller/healthcheck_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace
+from flask_restx import Resource, Namespace
 from elasticsearch import Elasticsearch
 import redis
 import os

app/main/controller/image_classification_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 import redis
 import hashlib
 import json

app/main/controller/image_ocr_controller.py

@@ -1,6 +1,6 @@
 from flask import request, current_app as app
 from urllib3 import Retry
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from google.cloud import vision
 import tenacity
 

app/main/controller/image_similarity_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from app.main.lib.fields import JsonObject
 
 from app.main.lib import similarity

app/main/controller/langid_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 import redis
 import hashlib
 import json

app/main/controller/model_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 import json
 import numpy as np
 from app.main.lib.shared_models.shared_model import SharedModel

app/main/controller/similarity_controller.py

@@ -1,6 +1,6 @@
 from flask import request, current_app as app
 from flask import abort, jsonify
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from elasticsearch import Elasticsearch
 from app.main.lib.shared_models.shared_model import SharedModel
 

app/main/controller/translation_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from google.cloud import translate_v2 as translate
 
 from app.main.lib.google_client import get_credentialed_google_client

app/main/controller/video_similarity_controller.py

@@ -1,5 +1,5 @@
 from flask import request, current_app as app
-from flask_restplus import Resource, Namespace, fields
+from flask_restx import Resource, Namespace, fields
 from app.main.lib.fields import JsonObject
 
 from app.main.lib import similarity

app/main/lib/fields.py

@@ -1,4 +1,4 @@
-from flask_restplus import fields
+from flask_restx import fields
 
 class JsonObject(fields.Raw):
     __schema_type__ = ["object"]

app/test/base.py

@@ -1,16 +1,19 @@
-from flask_testing import TestCase
+# from flask_testing import TestCase
+# from unittest import TestCase
+from flask_unittest import ClientTestCase
 from app.main import db
 from manage import app
 
 
-class BaseTestCase(TestCase):
+class BaseTestCase(ClientTestCase):
     """ Base Tests """
 
     def create_app(self):
         app.config.from_object('app.main.config.TestingConfig')
         return app
 
     def setUp(self):
+        self.app = create_app()
         db.create_all()
         db.session.commit()
 

manage.py

@@ -207,12 +207,15 @@ def init_perl_functions():
         AS $$
             my @first=@{ $_[0]; };
             my @second=@{ $_[1]; };
-            my $span=20;
-            my $compare = $_SHARED{compare};
-            my @corr = &$compare(\@first, \@second, $span);
-            my $maxindex = $_SHARED{maxindex};
-            my $max_corr_index = &$maxindex(\@corr);
-            return 1-@corr[$max_corr_index]
+            if (scalar(@first)*0.8 <= scalar(@second) && scalar(@first)*1.2 >= scalar(@second)) {
+                my $span=20;
+                my $compare = $_SHARED{compare};
+                my @corr = &$compare(\@first, \@second, $span);
+                my $maxindex = $_SHARED{maxindex};
+                my $max_corr_index = &$maxindex(\@corr);
+                return 1-@corr[$max_corr_index]
+            }
+            return 0.0
         $$
         LANGUAGE plperl;
       """)

requirements.txt

@@ -1,4 +1,4 @@
-absl-py==0.9.0
+absl-py==1.0.0
 accumulation-tree==0.6
 alembic==1.0.1
 aniso8601==3.0.2
@@ -15,7 +15,7 @@ boto3==1.18.51
 botocore==1.21.51
 bz2file==0.98
 cachetools==2.1.0
-certifi==2018.10.15
+certifi==2022.12.7
 cffi==1.11.5
 chardet==3.0.4
 charset-normalizer==2.0.4
@@ -31,13 +31,14 @@ fastapi==0.68.0
 feedfinder2==0.0.4
 feedparser==6.0.8
 filelock==3.0.12
-Flask==1.0.2
+Flask==1.1.0
 Flask-Bcrypt==0.7.1
 Flask-Migrate==2.2.1
-flask-restplus==0.12.1
+flask-restx==1.0.3
 Flask-Script==2.0.6
 Flask-SQLAlchemy==2.4.1
-Flask-Testing==0.7.1
+#Flask-Testing==0.7.1
+flask_unittest==0.1.3
 gast==0.3.3
 google-api-core==1.16.0
 google-auth==1.6.3
@@ -59,13 +60,13 @@ itsdangerous==0.24
 jieba3k==0.35.1
 Jinja2==2.11.3
 jmespath==0.9.3
-joblib==1.0.1
+joblib==1.2.0
 json-logging==1.2.0
 jsonschema==2.6.0
 Keras-Applications==1.0.8
 Keras-Preprocessing==1.1.1
 # lxml==4.6.3
-Mako==1.0.7
+Mako==1.2.2
 Markdown==3.2.1
 MarkupSafe==1.1.1
 msgpack==0.5.6
@@ -81,7 +82,7 @@ pact-python==1.4.5
 # Pillow==8.1.1
 plac==0.9.6
 preshed==2.0.1
-protobuf==3.9.2
+protobuf==3.18.3
 protobuf3-to-dict==0.1.5
 psutil==5.8.0
 psycopg2==2.8.4
@@ -92,7 +93,7 @@ pycld3==0.22
 pycparser==2.19
 pydantic==1.8.2
 pydub==0.25.1
-PyJWT==1.6.4
+PyJWT==2.4.0
 pyparsing==2.4.7
 python-dateutil==2.7.3
 python-editor==1.0.3
@@ -123,12 +124,12 @@ srsly==1.0.5
 starlette==0.14.2
 tdigest==0.5.2.2
 tenacity==6.1.0
-tensorboard==2.3.0
+tensorboard==2.9.0
 tensorboard-plugin-wit==1.8.0
-tensorflow==2.3.1
-tensorflow-estimator==2.3.0
+tensorflow==2.9.3
+tensorflow-estimator==2.9.0
 tensorflow-hub==0.8.0
-tensorflow-text==2.3.0
+tensorflow-text==2.9.0
 termcolor==1.1.0
 thinc==7.3.1
 threadpoolctl==2.2.0
@@ -147,7 +148,7 @@ ujson==1.35
 urllib3==1.26.7
 uvicorn==0.15.0
 wasabi==0.8.2
-Werkzeug==0.16.0
+Werkzeug==1.0.1
 wrapt==1.11.1
 zipp==3.5.0
 pyacoustid==1.2.2