rixty/KoboldAI-Client
1
1
Fork 0
mirror of https://github.com/KoboldAI/KoboldAI-Client.git synced 2025-06-05 21:59:24 +02:00
Code Issues Projects Releases Wiki Activity

Fix double slashing

Browse Source
This commit is contained in:
somebody
2023-04-15 13:30:05 -05:00
parent d3a73aaeba
commit 08b4e317ff
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
aiserver.py
View File

@@ -1911,12 +1911,16 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
if koboldai_vars.model == "ReadOnly" or koboldai_vars.noai: if koboldai_vars.model == "ReadOnly" or koboldai_vars.noai:
print(":P") print(":P")
elif koboldai_vars.model in ["Colab", "API", "CLUSTER", "OAI"]: elif koboldai_vars.model in ["Colab", "API", "CLUSTER", "OAI"]:
koboldai_vars.colaburl = url or koboldai_vars.colaburl
koboldai_vars.usegpu = False
koboldai_vars.breakmodel = False
if koboldai_vars.model == "Colab": if koboldai_vars.model == "Colab":
from modeling.inference_models.basic_api import BasicAPIInferenceModel from modeling.inference_models.basic_api import BasicAPIInferenceModel
model = BasicAPIInferenceModel() model = BasicAPIInferenceModel()
elif koboldai_vars.model == "API": elif koboldai_vars.model == "API":
from modeling.inference_models.api import APIInferenceModel from modeling.inference_models.api import APIInferenceModel
model = APIInferenceModel(url.replace("/request", "")) model = APIInferenceModel(koboldai_vars.colaburl.replace("/request", ""))
elif koboldai_vars.model == "CLUSTER": elif koboldai_vars.model == "CLUSTER":
from modeling.inference_models.horde import HordeInferenceModel from modeling.inference_models.horde import HordeInferenceModel
model = HordeInferenceModel() model = HordeInferenceModel()
@@ -1924,9 +1928,6 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
from modeling.inference_models.openai import OpenAIAPIInferenceModel from modeling.inference_models.openai import OpenAIAPIInferenceModel
model = OpenAIAPIInferenceModel() model = OpenAIAPIInferenceModel()
koboldai_vars.colaburl = url or koboldai_vars.colaburl
koboldai_vars.usegpu = False
koboldai_vars.breakmodel = False
model.load(initial_load=initial_load) model.load(initial_load=initial_load)
# TODO: This check sucks, make a model object or somethign # TODO: This check sucks, make a model object or somethign
elif "rwkv" in koboldai_vars.model: elif "rwkv" in koboldai_vars.model:

2
modeling/inference_models/api.py
View File

@@ -25,7 +25,7 @@ class APIException(Exception):
class APIInferenceModel(InferenceModel): class APIInferenceModel(InferenceModel):
def __init__(self, base_url: str) -> None: def __init__(self, base_url: str) -> None:
super().__init__() super().__init__()
self.base_url = base_url self.base_url = base_url.rstrip("/")
def _load(self, save_model: bool, initial_load: bool) -> None: def _load(self, save_model: bool, initial_load: bool) -> None:
tokenizer_id = requests.get(f"{self.base_url}/api/v1/model").json()["result"] tokenizer_id = requests.get(f"{self.base_url}/api/v1/model").json()["result"]