Skip to content

Remove refinery-config #129

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Nov 19, 2024
Merged

Remove refinery-config #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20b8d99
edit url
anmarhindi Nov 5, 2024
abab5ab
remove config service
anmarhindi Nov 5, 2024
77fac6c
remove config service
anmarhindi Nov 5, 2024
64e7d4b
Adjust config route
anmarhindi Nov 5, 2024
e03e9e0
remove check_config_service
anmarhindi Nov 6, 2024
686208a
Merge remote-tracking branch 'origin/dev' into config
JWittmeyer Nov 14, 2024
0dd6125
Remove of unused config handler
JWittmeyer Nov 14, 2024
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
11 changes: 3 additions & 8 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import torch

from submodules.model.business_objects import general
from util import request_util, config_handler
from util import request_util
from submodules.model import session

app = FastAPI()
Expand Down Expand Up @@ -185,12 +185,6 @@ def calc_tensor(
)


@app.put("/config_changed")
def config_changed() -> responses.PlainTextResponse:
config_handler.refresh_config()
return responses.PlainTextResponse(status_code=status.HTTP_200_OK)


@app.get("/healthcheck")
def healthcheck() -> responses.PlainTextResponse:
text = ""
Expand All @@ -204,4 +198,5 @@ def healthcheck() -> responses.PlainTextResponse:
text = "OK"
return responses.PlainTextResponse(text, status_code=status_code)

session.start_session_cleanup_thread()

session.start_session_cleanup_thread()
31 changes: 0 additions & 31 deletions check_config_service
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from typing import Any, Dict, Iterator, List, Optional

from util import daemon, request_util
from util.config_handler import get_config_value
from util.decorator import param_throttle
from util.embedders import get_embedder
from util.notification import send_project_update, embedding_warning_templates
Expand Down Expand Up @@ -208,9 +207,7 @@ def run_encoding(
iso2_code = project.get_blank_tokenizer_from_project(project_id)
try:
if platform == "huggingface":
if not __is_embedders_internal_model(model) and get_config_value(
"is_managed"
):
if not __is_embedders_internal_model(model):
config_string = request_util.get_model_path(model)
if isinstance(config_string, dict):
config_string = model
Expand Down
2 changes: 0 additions & 2 deletions start
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash
trap "echo -ne '\nstopping container...' && docker stop refinery-embedder > /dev/null 2>&1 && echo -ne '\t\t [done]\n'" EXIT

source check_config_service

HOST_IP=$(docker network inspect bridge --format='{{json .IPAM.Config}}' | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -1)

echo -ne 'stopping old container...'
Expand Down
2 changes: 1 addition & 1 deletion submodules/model
Open in desktop
Submodule model updated 18 files
+4 −0 business_objects/general.py
+0 −276 business_objects/inter_annotator.py
+28 −0 business_objects/monitor.py
+0 −238 business_objects/project.py
+3 −5 cognition_objects/conversation.py
+5 −30 cognition_objects/environment_variable.py
+146 −0 cognition_objects/file_extraction.py
+91 −0 cognition_objects/file_reference.py
+172 −0 cognition_objects/file_transformation.py
+9 −59 cognition_objects/markdown_file.py
+105 −0 cognition_objects/message.py
+79 −11 cognition_objects/pipeline_log.py
+5 −2 cognition_objects/project.py
+8 −1 cognition_objects/strategy.py
+38 −10 enums.py
+123 −4 models.py
+1 −1 session.py
+5 −5 util.py
2 changes: 1 addition & 1 deletion submodules/s3
Open in desktop
Submodule s3 updated 3 files
+9 −0 connections/aws.py
+9 −0 connections/minio.py
+25 −0 controller.py
3 changes: 1 addition & 2 deletions util/config_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from typing import Dict, Any, Optional, Union
import requests
import json
import time
from util import daemon

__config = None

# meant as a const value since env variables will be removed at some point
REQUEST_URL = "http://refinery-config:80/full_config"
REQUEST_URL = "http://refinery-gateway:80/full_config"


def __get_config() -> Dict[str, Any]:
Expand Down