From daa4f66ea8a19ee04c5860d21272c46ba73cc2bd Mon Sep 17 00:00:00 2001 From: Spyros Date: Sun, 16 Feb 2025 13:03:09 +0000 Subject: [PATCH 1/5] fix requirements --- requirements.txt | 165 ++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 81 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1162489d..f495eb7a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,113 +1,116 @@ -alive-progress -babel -beautifulsoup4 -brlapi -cloud-init -colorama -command-not-found +black==24.4.2 # do not touch, same version as superlinter +click compliance-trestle -configobj coverage -cssselect -cupshelpers dacite -dbus-python -defer -distro-info -duplicity -email-validator -en-core-web-sm -evdev -ewmh -fasteners -flask-caching -flask-compress -flask-cors -flask-migrate -freetype-py -future +Flask +Flask_Caching +flask_compress +Flask_Cors +Flask_Migrate +Flask-SQLAlchemy +setuptools gitpython -grpcio-status -grpcio-tools +google-api-core +google_auth_oauthlib +google-cloud-aiplatform +grpcio_status +grpcio gspread gunicorn -html5lib -jsonpatch -jsonpointer -keyring -language-selector -launchpadlib -lockfile -louis -lxml -mergedeep -neomodel -netifaces networkx nltk -nose -olefile +oauthlib openai +playwright +psycopg2-binary +pygithub +python_markdown_maker +scikit_learn +scipy +semver +setuptools +SQLAlchemy +compliance-trestle +nose +mypy +numpy +neo4j +neomodel +openapi-schema-validator openapi-spec-validator -opentelemetry-exporter-gcp-trace -opentelemetry-instrumentation-flask -opentelemetry-instrumentation-requests -opentelemetry-instrumentation-sqlalchemy -opentelemetry-propagator-gcp +openpyxl +orderedmultidict +packaging +paramiko +pathable +pathspec +pbr pep517 -pexpect -pillow +Pillow pip-autoremove -pip-chill -pipenv -pipx -posthog +platformdirs +playwright +pluggy prance prompt-toolkit -psutil +proto-plus +protobuf psycopg2-binary -ptyprocess -pycairo +pyasn1 +pyasn1-modules pycodestyle -pycups +pycparser +pydantic +pyee pyflakes -pygithub -pygobject +PyGithub +PyJWT +PyNaCl +pyparsing pyrsistent -pyserial -pysnooper +PySnooper +pytest +pytest-base-url pytest-playwright -python-apt -python-debian +python-dateutil +python-dotenv +python-frontmatter python-markdown-maker -python-xlib -pyudev -pyxdg +python-slugify +PyYAML==6.0.1 +regex +requests +requests-oauthlib rfc3986 +rsa rq +redis +ruamel.yaml +ruamel.yaml.clib scikit-learn -scour -semver +Shapely +six +smmap +sniffio +soupsieve +SQLAlchemy sqlalchemy-stubs -systemd-python -terminator testresources +text-unidecode +threadpoolctl toml tomli +tqdm typed-ast -types-pyyaml +types-PyYAML typing-inspect -ubuntu-drivers-common -ubuntu-pro-client -ufw -unattended-upgrades +typing_extensions untangle -usb-creator +urllib3 vertexai -wadllib -watchdog -webencodings -xdg -xkit xmltodict -yamllint +google-cloud-trace +alive-progress +posthog + From e34e43396c69e8a0fa1ebd9c8e238fd874947ee4 Mon Sep 17 00:00:00 2001 From: Spyros Date: Sun, 16 Feb 2025 13:10:36 +0000 Subject: [PATCH 2/5] trigger build --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f495eb7a..fe3ca433 100644 --- a/requirements.txt +++ b/requirements.txt @@ -52,6 +52,7 @@ pip-autoremove platformdirs playwright pluggy +posthog prance prompt-toolkit proto-plus @@ -112,5 +113,4 @@ vertexai xmltodict google-cloud-trace alive-progress -posthog From 95f3edb7a9eea04ad831e10dd16230c47039a7e1 Mon Sep 17 00:00:00 2001 From: Spyros Date: Sun, 16 Feb 2025 13:11:30 +0000 Subject: [PATCH 3/5] upgrade python --- .python-version | 1 + runtime.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .python-version delete mode 100644 runtime.txt diff --git a/.python-version b/.python-version new file mode 100644 index 00000000..2c073331 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.11 diff --git a/runtime.txt b/runtime.txt deleted file mode 100644 index d45f665d..00000000 --- a/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -python-3.11.7 \ No newline at end of file From ac921569f3b5fd0c1b73e8bef0ce3f7f685d0acd Mon Sep 17 00:00:00 2001 From: Spyros Date: Sun, 16 Feb 2025 13:29:59 +0000 Subject: [PATCH 4/5] add all arguments to posthog events capture --- application/web/web_main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/web/web_main.py b/application/web/web_main.py index fc3ab622..e54eaf22 100644 --- a/application/web/web_main.py +++ b/application/web/web_main.py @@ -356,7 +356,7 @@ def fetch_job() -> Any: @app.route("/rest/v1/standards", methods=["GET"]) def standards() -> Any: if posthog: - posthog.capture(f"standards") + posthog.capture(f"standards","") database = db.Node_collection() standards = database.standards() @@ -407,7 +407,7 @@ def find_root_cres() -> Any: """ if posthog: - posthog.capture(f"find_root_cres") + posthog.capture(f"find_root_cres","") database = db.Node_collection() # opt_osib = request.args.get("osib") @@ -590,7 +590,7 @@ def login_r(*args, **kwargs): def chat_cre() -> Any: message = request.get_json(force=True) if posthog: - posthog.capture(f"chat_cre") + posthog.capture(f"chat_cre","") database = db.Node_collection() prompt = prompt_client.PromptHandler(database) @@ -709,7 +709,7 @@ def logout(): def all_cres() -> Any: database = db.Node_collection() if posthog: - posthog.capture(f"all_cres") + posthog.capture(f"all_cres","") page = 1 per_page = ITEMS_PER_PAGE @@ -735,7 +735,7 @@ def all_cres() -> Any: @app.route("/rest/v1/cre_csv", methods=["GET"]) def get_cre_csv() -> Any: if posthog: - posthog.capture(f"get_cre_csv") + posthog.capture(f"get_cre_csv","") database = db.Node_collection() root_cres = database.get_root_cres() From 0102bcef2f2ba17633db2f2002cb3a40e976dc33 Mon Sep 17 00:00:00 2001 From: Spyros Date: Sun, 16 Feb 2025 14:12:55 +0000 Subject: [PATCH 5/5] remove --export from the cli args --- application/web/web_main.py | 10 +++++----- cre.py | 6 ------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/application/web/web_main.py b/application/web/web_main.py index e54eaf22..7517138b 100644 --- a/application/web/web_main.py +++ b/application/web/web_main.py @@ -356,7 +356,7 @@ def fetch_job() -> Any: @app.route("/rest/v1/standards", methods=["GET"]) def standards() -> Any: if posthog: - posthog.capture(f"standards","") + posthog.capture(f"standards", "") database = db.Node_collection() standards = database.standards() @@ -407,7 +407,7 @@ def find_root_cres() -> Any: """ if posthog: - posthog.capture(f"find_root_cres","") + posthog.capture(f"find_root_cres", "") database = db.Node_collection() # opt_osib = request.args.get("osib") @@ -590,7 +590,7 @@ def login_r(*args, **kwargs): def chat_cre() -> Any: message = request.get_json(force=True) if posthog: - posthog.capture(f"chat_cre","") + posthog.capture(f"chat_cre", "") database = db.Node_collection() prompt = prompt_client.PromptHandler(database) @@ -709,7 +709,7 @@ def logout(): def all_cres() -> Any: database = db.Node_collection() if posthog: - posthog.capture(f"all_cres","") + posthog.capture(f"all_cres", "") page = 1 per_page = ITEMS_PER_PAGE @@ -735,7 +735,7 @@ def all_cres() -> Any: @app.route("/rest/v1/cre_csv", methods=["GET"]) def get_cre_csv() -> Any: if posthog: - posthog.capture(f"get_cre_csv","") + posthog.capture(f"get_cre_csv", "") database = db.Node_collection() root_cres = database.get_root_cres() diff --git a/cre.py b/cre.py index 277e2d8b..e95b90f6 100644 --- a/cre.py +++ b/cre.py @@ -112,12 +112,6 @@ def main() -> None: default=None, help="define location of local directory to export database in OSIB format to", ) - - parser.add_argument( - "--export", - default=None, - help="export all data into yaml files under the directory pointed to by this argument", - ) # Start External Project importing parser.add_argument( "--zap_in",