happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SimpleChatTC:SimpleProxy:LoadConfig ProcessArgs cleanup - initial 

Now both follow a similar mechanism and do the following

* exit on finding any issue, so that things are in a known
  state from usage perspective, without any confusion/overlook

* check if the cmdlineArgCmd/configCmd being processed is a known
  one or not.

* check value of the cmd is of the expected type

* have a generic flow which can accomodate more cmds in future
  in a simple way
This commit is contained in:
hanishkvc 2025-10-27 09:09:05 +05:30
parent a1b33ecd1c
commit f221a2c356
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tools/server/public_simplechat/local.tools/simpleproxy.py
View File

@ -32,6 +32,13 @@ gMe = {
'server': None
}
gConfigType = {
'--port': 'int',
'--config': 'str',
'--debug': 'bool',
'--allowed.domains': 'list'
}
class ProxyHandler(http.server.BaseHTTPRequestHandler):
"""
@ -318,7 +325,18 @@ def load_config():
with open(gMe['--config']) as f:
cfg = json.load(f)
for k in cfg:
gMe[f"--{k}"] = cfg[k]
try:
cArg = f"--{k}"
aTypeCheck = gConfigType[cArg]
aValue = cfg[k]
aType = type(aValue).__name__
if aType != aTypeCheck:
print(f"ERRR:LoadConfig:{k}:expected type [{aTypeCheck}] got type [{aType}]")
exit(112)
gMe[cArg] = aValue
except KeyError:
print(f"ERRR:LoadConfig:{k}:UnknownCommand")
exit(113)
def process_args(args: list[str]):
@ -327,38 +345,25 @@ def process_args(args: list[str]):
Helper to process command line arguments
"""
global gMe
gMe['INTERNAL.ProcessArgs.Malformed'] = []
gMe['INTERNAL.ProcessArgs.Unknown'] = []
iArg = 1
while iArg < len(args):
cArg = args[iArg]
if (not cArg.startswith("--")):
gMe['INTERNAL.ProcessArgs.Malformed'].append(cArg)
print(f"WARN:ProcessArgs:{iArg}:IgnoringMalformedCommandOr???:{cArg}")
print(f"ERRR:ProcessArgs:{iArg}:{cArg}:MalformedCommandOr???")
exit(101)
try:
aTypeCheck = gConfigType[cArg]
iArg += 1
continue
match cArg:
case '--port':
iArg += 1
gMe[cArg] = int(args[iArg])
iArg += 1
case '--config':
iArg += 1
gMe[cArg] = args[iArg]
iArg += 1
load_config()
case '--allowed.domains':
iArg += 1
gMe[cArg] = ast.literal_eval(args[iArg])
iArg += 1
case '--debug':
iArg += 1
gMe[cArg] = ast.literal_eval(args[iArg])
iArg += 1
case _:
gMe['INTERNAL.ProcessArgs.Unknown'].append(cArg)
print(f"WARN:ProcessArgs:{iArg}:IgnoringUnknownCommand:{cArg}")
aValue = ast.literal_eval(args[iArg])
aType = type(aValue).__name__
if aType != aTypeCheck:
print(f"ERRR:ProcessArgs:{iArg}:{cArg}:expected type [{aTypeCheck}] got type [{aType}]")
exit(102)
gMe[cArg] = aValue
iArg += 1
except KeyError:
print(f"ERRR:ProcessArgs:{iArg}:{cArg}:UnknownCommand")
exit(103)
print(gMe)