hueso/Alpaca
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bearer token use for remote ollama APIs. (#197)

Browse Source
This commit is contained in:
ProjectMoon 2024-08-06 21:48:05 +02:00 committed by GitHub
parent 20fd2cf6e3
commit f3610a46a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/window.py
View File

@ -1441,7 +1441,7 @@ Generate a title following these rules:
def connect_remote(self, url, bearer_token): def connect_remote(self, url, bearer_token):
logger.debug(f"Connecting to remote: {url}") logger.debug(f"Connecting to remote: {url}")
connection_handler.url = url connection_handler.url = url
connection_handler.bearer_token = bearer_token connection_handler.BEARER_TOKEN = bearer_token
self.remote_url = connection_handler.url self.remote_url = connection_handler.url
self.remote_connection_entry.set_text(self.remote_url) self.remote_connection_entry.set_text(self.remote_url)
if self.verify_connection() == False: self.connection_error() if self.verify_connection() == False: self.connection_error()
@ -1449,7 +1449,7 @@ Generate a title following these rules:
def connect_local(self): def connect_local(self):
logger.debug("Connecting to Alpaca's Ollama instance") logger.debug("Connecting to Alpaca's Ollama instance")
self.run_remote = False self.run_remote = False
connection_handler.bearer_token = None connection_handler.BEARER_TOKEN = None
connection_handler.url = f"http://127.0.0.1:{local_instance.port}" connection_handler.url = f"http://127.0.0.1:{local_instance.port}"
local_instance.start() local_instance.start()
if self.verify_connection() == False: if self.verify_connection() == False:
@ -1460,7 +1460,7 @@ Generate a title following these rules:
def connection_error(self): def connection_error(self):
logger.error("Connection error") logger.error("Connection error")
if self.run_remote: if self.run_remote:
dialogs.reconnect_remote(self, connection_handler.url, connection_handler.bearer_token) dialogs.reconnect_remote(self, connection_handler.url, connection_handler.BEARER_TOKEN)
else: else:
local_instance.reset() local_instance.reset()
self.show_toast(_("There was an error with the local Ollama instance, so it has been reset"), self.main_overlay) self.show_toast(_("There was an error with the local Ollama instance, so it has been reset"), self.main_overlay)
@ -1471,14 +1471,14 @@ Generate a title following these rules:
if new_value != self.run_remote: if new_value != self.run_remote:
self.run_remote = new_value self.run_remote = new_value
if self.run_remote: if self.run_remote:
connection_handler.bearer_token = self.remote_bearer_token connection_handler.BEARER_TOKEN = self.remote_bearer_token
connection_handler.url = self.remote_url connection_handler.url = self.remote_url
if self.verify_connection() == False: if self.verify_connection() == False:
self.connection_error() self.connection_error()
else: else:
local_instance.stop() local_instance.stop()
else: else:
connection_handler.bearer_token = None connection_handler.BEARER_TOKEN = None
connection_handler.url = f"http://127.0.0.1:{local_instance.port}" connection_handler.url = f"http://127.0.0.1:{local_instance.port}"
local_instance.start() local_instance.start()
if self.verify_connection() == False: if self.verify_connection() == False:
@ -1769,11 +1769,11 @@ Generate a title following these rules:
self.remote_connection_entry.set_text(self.remote_url) self.remote_connection_entry.set_text(self.remote_url)
self.remote_bearer_token_entry.set_text(self.remote_bearer_token) self.remote_bearer_token_entry.set_text(self.remote_bearer_token)
if self.run_remote: if self.run_remote:
connection_handler.bearer_token = self.remote_bearer_token connection_handler.BEARER_TOKEN = self.remote_bearer_token
connection_handler.url = self.remote_url connection_handler.url = self.remote_url
self.remote_connection_switch.set_active(True) self.remote_connection_switch.set_active(True)
else: else:
connection_handler.bearer_token = None connection_handler.BEARER_TOKEN = None
self.remote_connection_switch.set_active(False) self.remote_connection_switch.set_active(False)
connection_handler.url = f"http://127.0.0.1:{local_instance.port}" connection_handler.url = f"http://127.0.0.1:{local_instance.port}"
local_instance.start() local_instance.start()