aoutler/aidgaf-server
aoutler/aidgaf-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: aoutler:751affef701edbb9aff55353a8f1f840af834e9a
Branches Tags
aoutler:main
..
compare: aoutler:d497707a058957be8ffa0817f19eb5a5fac72fc1
Branches Tags
aoutler:main

No commits in common. "751affef701edbb9aff55353a8f1f840af834e9a" and "d497707a058957be8ffa0817f19eb5a5fac72fc1" have entirely different histories.
751affef70 ... d497707a05

2 changed files with 23 additions and 23 deletions
Show Stats Expand all files Collapse all files

5
Jenkinsfile vendored
View File

@ -45,12 +45,13 @@ pipeline {
string(credentialsId: 'OpenAI-API-Token', variable: 'OPEN_AI_TOKEN'), string(credentialsId: 'OpenAI-API-Token', variable: 'OPEN_AI_TOKEN'),
string(credentialsId: 'PapaHashingSecret', variable: 'PAPA_HASH'), string(credentialsId: 'PapaHashingSecret', variable: 'PAPA_HASH'),
string(credentialsId: 'PapaAsyncUrl', variable: 'ASYNC_URL'), string(credentialsId: 'PapaAsyncUrl', variable: 'ASYNC_URL'),
sshUserPrivateKey(credentialsId: 'dockeruserOn192.168.1.115', keyFileVariable: 'sshkey')]) { sshUserPrivateKey(credentialsId: 'dockeruserOn192.168.1.115', keyFileVariable: 'sshkey')
]) {
sh '#!/bin/sh \n' + sh '#!/bin/sh \n' +
'mkdir -p ~/.ssh; cp "$sshkey" ~/.ssh/id_rsa' 'mkdir -p ~/.ssh; cp "$sshkey" ~/.ssh/id_rsa'
sh '#!/bin/sh \n' + sh '#!/bin/sh \n' +
/* groovylint-disable-next-line GStringExpressionWithinString */ /* groovylint-disable-next-line GStringExpressionWithinString */
'docker run --name=aidgaf-server -eSERVERPORT=8087 -eHOSTNAME=0.0.0.0 -eHASHKEY="${PAPA_HASH}" -eAPIKEY="${OPEN_AI_TOKEN}" -eASYNC_METHOD="PATCH" -eASYNC_URL="${ASYNC_URL}" -p8087:8087 -d --restart=always aidgaf' 'docker run --name=aidgaf-server -eSERVERPORT=8087 -eHOSTNAME=0.0.0.0 -eHASHKEY="${PAPA_HASH}" -eAPIKEY="${OPEN_AI_TOKEN}" -eASYNC_METHOD="PATCH" -eASYNC_URL="${PapaAsyncUrl}" -p8087:8087 -d --restart=always aidgaf'
} }
} }
} }

7
src/aidgaf/aidgaf_server/server.py
View File

@ -14,7 +14,6 @@ from const import UTF8, REPORTING_TIMEOUT
default_request_body = b'{"message":{"command":"aidgaf","data":{"username":"AdamOutler"}}}' default_request_body = b'{"message":{"command":"aidgaf","data":{"username":"AdamOutler"}}}'
request_headers = {} request_headers = {}
class IDGAFServer(BaseHTTPRequestHandler): class IDGAFServer(BaseHTTPRequestHandler):
""" This class handles the requests from the client. """ """ This class handles the requests from the client. """
@ -57,8 +56,7 @@ class IDGAFServer(BaseHTTPRequestHandler):
self.handle_response(code,body) self.handle_response(code,body)
return return
thread = threading.Thread( thread = threading.Thread(target=self.send_async_request, args=(command,))
target=self.send_async_request, args=(command,))
thread.start() thread.start()
self.handle_response(200,json.dumps(command)) self.handle_response(200,json.dumps(command))
@ -69,7 +67,6 @@ class IDGAFServer(BaseHTTPRequestHandler):
Parameters: Parameters:
command: The command object received from the client. """ command: The command object received from the client. """
print("using async for response")
[code,body] = self.getGPTResponse(command) [code,body] = self.getGPTResponse(command)
merged=merge.merge_dict_no_overwrite(json.loads(body),command) merged=merge.merge_dict_no_overwrite(json.loads(body),command)
merged['hash']=security.get_message_hash(json.dumps(merged)) merged['hash']=security.get_message_hash(json.dumps(merged))
@ -90,6 +87,8 @@ class IDGAFServer(BaseHTTPRequestHandler):
timeout=REPORTING_TIMEOUT) timeout=REPORTING_TIMEOUT)
print(str(resp)+resp.text) print(str(resp)+resp.text)
# gpt_response = requests.post(URL, json=data, headers=request_headers) # gpt_response = requests.post(URL, json=data, headers=request_headers)
def getGPTResponse(self, command) -> [int, str]: def getGPTResponse(self, command) -> [int, str]: