Release v1.2.0 - Second PR (#41)

* Update LICENSE

* Adds is_demo to mutations

* Adds demo check for more endpoints

* Adds demo check for project and upload task

* Small adjustments and removes check for demo for create orga

* Adding admin rights for demo version

* Splits app.py into modularized files

* submodule update

* Adds PR changes to work with frontend

* Renames folder handler to middleware

* Submodule update

* Adds restricted endpoint query

* Demo check for rest apis

* Adds blacklist of restricted endpoints

* Adds and slightly changes endpoint

* Removes endpoint notify check for demo

* Changes function name & removes endpoint

* Init sample project state added

* Enum pass without value

* Updates submodule

* Adds import of exported file for knowledge terms

If a file gets imported (for knowledge terms) first the app
will try to read it in the strucutre of exported lists.
If the imported file don't have a fitting structure it gets canceled and the
original import flow will continue

* Adds typing

* Adds yml file

* Add dependabot yml (#20)

* Adds small change

* Adds small change

* Bump pyjwt from 2.1.0 to 2.4.0 (#22)

Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.1.0 to 2.4.0.
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](jpadilla/pyjwt@2.1.0...2.4.0)

---
updated-dependencies:
- dependency-name: pyjwt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fixes #10, adds arm tags to exec envs

* Extend comment

* adds EMBEDDING_CREATION_WARNING to notification data (#24)

* Dependabot pip numpy 1.22.0 (#21)

* Bump numpy from 1.21.0 to 1.22.0

Bumps [numpy](https://github.com/numpy/numpy) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst)
- [Commits](numpy/numpy@v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* bump further to 1.23.1

* Changes python version to match numpy version

* Changes python version in dockerfile

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Adds qutation escaping (#25)

* Adds qutation escaping

* remove pass

* Update service/search/search.py

Co-authored-by: Felix Kirsch <[email protected]>

* change to union type

Co-authored-by: Felix Kirsch <[email protected]>

* Adds hotfix (#26)

* Adds hotfix

* changes spacy version for drone

* remove specific path

* Removes project export from demo (#27)

* Changes allowed demo usecases (#29)

* Integration for the model provider service (#32)

* Get model provider info

* adds connection to model provider service

* implements first version of using model provider service for embeddings

* Create and delete requests

* adds params to delete_call_or_raise

* removes changed to embedding connector

* changed api names, access control

* adds status to model provider info results

* model mutations only for admins or on server with just one organization

* Added zero shot pipeline

* removes revision and project_id from api endpoints, pr comments

* use datetime as graphene type

* replace dict as default value in delete service_request

Co-authored-by: Lina <[email protected]>

* Gateway changes for a more complex update logic (#35)

* Adds alemic version to app version table

* Query for getting version overview

* submodule change

* changes alembic version to new name

* Renamed checked version to remote version

* Changes logic from dummy to service call

* Adds remote_has_newer to request restult

* Remove print

* Removed unused import date

Co-authored-by: Lina <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: JWittmeyer <[email protected]>
Co-authored-by: simonrempel <[email protected]>
Co-authored-by: JWittmeyer <[email protected]>
Co-authored-by: Simon Degraf <[email protected]>
Co-authored-by: Lina <[email protected]>
Co-authored-by: lumburovskalina <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 6 people

alembic/versions/5b3a4deea1c4_adds_service_version_table.py

@@ -0,0 +1,35 @@
+"""Adds service version table
+
+Revision ID: 5b3a4deea1c4
+Revises: 992352f4c1f9
+Create Date: 2022-09-05 13:34:55.863128
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision = "5b3a4deea1c4"
+down_revision = "992352f4c1f9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "app_version",
+        sa.Column("service", sa.String(), nullable=False),
+        sa.Column("installed_version", sa.String(), nullable=True),
+        sa.Column("remote_version", sa.String(), nullable=True),
+        sa.Column("last_checked", sa.DateTime(), nullable=True),
+        sa.PrimaryKeyConstraint("service"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("app_version")

controller/misc/manager.py

@@ -1,6 +1,14 @@
-from typing import Dict, List
+from typing import Any, Dict, List
 from controller.misc import config_service
 from controller.misc import black_white_demo
+from graphql_api.types import ServiceVersionResult
+from datetime import datetime
+import os
+
+from util import service_requests
+
+BASE_URI_UPDATER = os.getenv("UPDATER")
+
 
 def check_is_managed() -> bool:
     return config_service.get_config_value("is_managed")
@@ -16,3 +24,39 @@ def refresh_config() -> None:
 
 def get_black_white_demo() -> Dict[str, List[str]]:
     return black_white_demo.get_black_white_demo()
+
+
+def get_version_overview() -> List[ServiceVersionResult]:
+    updater_version_overview = __updater_version_overview()
+    date_format = "%Y-%m-%dT%H:%M:%S.%f"  # 2022-09-06T12:10:39.167397
+    version_overview = [
+        ServiceVersionResult(
+            service=service["name"],
+            installed_version=service["installed_version"],
+            remote_version=service["remote_version"],
+            last_checked=datetime.strptime(service["last_checked"], date_format),
+            remote_has_newer=service["remote_has_newer"],
+            link=service["link"],
+        )
+        for service in updater_version_overview
+    ]
+    return version_overview
+
+
+def has_updates() -> List[ServiceVersionResult]:
+    has_updates = __updater_has_updates()
+    return has_updates
+
+
+def __updater_version_overview() -> List[Dict[str, Any]]:
+    url = f"{BASE_URI_UPDATER}/version_overview"
+    return service_requests.get_call_or_raise(url)
+
+
+def __updater_has_updates() -> bool:
+    url = f"{BASE_URI_UPDATER}/has_updates"
+    return service_requests.get_call_or_raise(url)
+
+
+def __updater_update_to_newest() -> None:
+    raise ValueError("This endpoint should only be called from the update batch script")

graphql_api/query/misc.py

@@ -3,7 +3,7 @@
 import graphene
 import util.user_activity
 from controller.auth import manager as auth
-from graphql_api.types import ToolTip, UserActivityWrapper
+from graphql_api.types import ServiceVersionResult, ToolTip, UserActivityWrapper
 from util import tooltip
 from controller.misc import config_service, manager
 
@@ -27,6 +27,10 @@ class MiscQuery(graphene.ObjectType):
 
     get_black_white_demo = graphene.Field(graphene.JSONString)
 
+    version_overview = graphene.Field(graphene.List(ServiceVersionResult))
+
+    has_updates = graphene.Field(graphene.Boolean)
+
     def resolve_tooltip(self, info, key: str) -> ToolTip:
         return tooltip.resolve_tooltip(key)
 
@@ -46,3 +50,9 @@ def resolve_is_admin(self, info) -> bool:
 
     def resolve_get_black_white_demo(self, info) -> str:
         return manager.get_black_white_demo()
+
+    def resolve_version_overview(self, info) -> List[ServiceVersionResult]:
+        return manager.get_version_overview()
+
+    def resolve_has_updates(self, info) -> bool:
+        return manager.has_updates()

graphql_api/types.py

@@ -684,6 +684,15 @@ class ZeroShotNRecordsWrapper(graphene.ObjectType):
     records = graphene.List(ZeroShotNRecords)
 
 
+class ServiceVersionResult(graphene.ObjectType):
+    service = graphene.String()
+    installed_version = graphene.String()
+    remote_version = graphene.String()
+    last_checked = graphene.DateTime()
+    remote_has_newer = graphene.Boolean()
+    link = graphene.String()
+
+
 class ModelProviderInfoResult(graphene.ObjectType):
     name = graphene.String()
     revision = graphene.String()

start

@@ -53,6 +53,7 @@ docker run -d --rm \
 -e S3_SECRET_KEY=r6ywtR33!DMlaL*SUUdy \
 -e WS_NOTIFY_ENDPOINT=http://refinery-websocket:8080 \
 -e POSTGRES=postgresql://postgres:onetask@graphql-postgres:5432 \
+-e UPDATER=http://refinery-updater:80 \
 -e NEURAL_SEARCH=http://refinery-neural-search:80 \
 -e MODEL_PROVIDER=http://refinery-model-provider:80 \
 -e WEAK_SUPERVISION=http://refinery-weak-supervisor:80 \