@@ -1375,6 +1393,7 @@ async def get_status(request):
data["status_info"] = status_info
data["stream_mtime"] = frame_mtime
data["preview_mtime"] = {key: state[key][0] for key in state if key.endswith("PreviewBox")}
+ data["log"] = {key: state[key] for key in state if key.endswith("LogBox")}
data["message"] = state["message"]
data["update_and_reload"] = state["update_and_reload"]
state["update_and_reload"] = False
@@ -1514,6 +1533,8 @@ async def load_preset(request):
buf = {"lora": buf.get("lora", "")}
state.update(stt)
+ param.clear()
+ param.update(default_param)
param.update(buf)
state["presetTitle"] = Path(state["presetFile"]).stem
time.sleep(UPDATE_DELAY)
@@ -1606,7 +1627,7 @@ class FlipStreamTextBox:
def run(self, label, default, **kwargs):
global frame_updating
frame_updating = time.time()
- param.setdefault(label, btoa_utf8(default))
+ param.setdefault(label, btoa_utf8(default))
return (atob_utf8(param[label]),)
@@ -1807,6 +1828,27 @@ class FlipStreamPreviewBox:
return ()
+class FlipStreamLogBox:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {
+ "required": {
+ "label": ("STRING", {"default": "empty"}),
+ "log": ("STRING",),
+ "rows": ("INT", {"default": 3}),
+ }
+ }
+
+ RETURN_TYPES = ()
+ OUTPUT_NODE = True
+ FUNCTION = "run"
+ CATEGORY = "FlipStreamViewer"
+
+ def run(self, label, log, **kwargs):
+ state[label + "LogBox"] = btoa_utf8(log)
+ return ()
+
+
class FlipStreamSetUpdateAndReload:
@classmethod
def INPUT_TYPES(s):
@@ -2377,8 +2419,9 @@ class FlipStreamChat:
"seed": ("INT", {"default": -1}),
"max_tokens": ("INT", {"default": 128, "min": 0}),
"presence_penalty": ("FLOAT", {"default": 0, "min": 0}),
- "frequency_penalty": ("FLOAT", {"default": 0, "min": 0}),
- "repeat_penalty": ("FLOAT", {"default": 1.0, "min": 0})
+ "frequency_penalty": ("FLOAT", {"default": 0.5, "min": 0}),
+ "repeat_penalty": ("FLOAT", {"default": 1.0, "min": 0}),
+ "response_format": ("STRING", {"default": "", "multiline": True})
},
"optional": {
"chat_model": ("CHAT_MODEL",),
@@ -2412,7 +2455,7 @@ class FlipStreamChat:
self.model.close()
self.model._FlipStreamChat_is_closed = True
- def chat(self, system, user, stop, messages, **kwargs):
+ def chat(self, system, user, stop, messages, response_format, **kwargs):
if system != self.system:
self.system = system
messages.clear()
@@ -2422,7 +2465,11 @@ class FlipStreamChat:
messages[0] = dict(role="system", content=system)
if user:
messages.append(dict(role="user", content=user))
- return self.model.create_chat_completion(messages, stop=list(filter(str.strip, stop.split(","))), **kwargs)["choices"][0]["message"]
+ if response_format:
+ response_format = json.loads(response_format)
+ else:
+ response_format = None
+ return self.model.create_chat_completion(messages, stop=list(filter(str.strip, stop.split(","))), response_format=response_format, **kwargs)["choices"][0]["message"]
def run(self, model_file, n_ctx, n_gpu_layers, unload_other_models, close_after_use, system, user, instant, max_history, stop, chat_model=None, messages=None, **kwargs):
if unload_other_models:
@@ -2441,7 +2488,7 @@ class FlipStreamChat:
if max_history == 0:
messages.clear()
elif max_history >= 1:
- messages[:] = messages[-max_history:]
+ messages[:] = messages[:max_history]
self.load_model(model_file, n_ctx, n_gpu_layers)
if instant:
res = self.chat(system, user, stop, messages.copy(), **kwargs)
@@ -2457,6 +2504,33 @@ class FlipStreamChat:
return (self.model, output, messages)
+class FlipStreamParseJson:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {
+ "required": {
+ "json_input": ("STRING", {"default": "", "multiline": True}),
+ "keys": ("STRING", {"default": "", "multiline": True}),
+ "joinstr": ("STRING", {"default": ",", "multiline": True}),
+ "ignore_error": ("BOOLEAN", {"default": True}),
+ }
+ }
+
+ RETURN_TYPES = ("STRING",)
+ FUNCTION = "run"
+ CATEGORY = "FlipStreamViewer"
+
+ def run(self, json_input, keys, joinstr, ignore_error):
+ value = []
+ try:
+ for key in keys.split(","):
+ value.append(json.loads(json_input)[key.strip()])
+ except Exception as e:
+ if not ignore_error:
+ raise RuntimeError(f"FlipStreamParseJsonItem: Invalid JSON input: {e}: {json_input}")
+ return (joinstr.join(value),)
+
+
class FlipStreamBatchPrompt:
@classmethod
def INPUT_TYPES(s):
@@ -2614,6 +2688,7 @@ NODE_CLASS_MAPPINGS = {
"FlipStreamFileSelect_Input": FlipStreamFileSelect_Input,
"FlipStreamFileSelect_Output": FlipStreamFileSelect_Output,
"FlipStreamPreviewBox": FlipStreamPreviewBox,
+ "FlipStreamLogBox": FlipStreamLogBox,
"FlipStreamSetUpdateAndReload": FlipStreamSetUpdateAndReload,
"FlipStreamSetMessage": FlipStreamSetMessage,
"FlipStreamSetParam": FlipStreamSetParam,
@@ -2631,6 +2706,7 @@ NODE_CLASS_MAPPINGS = {
"FlipStreamRembg": FlipStreamRembg,
"FlipStreamSegMask": FlipStreamSegMask,
"FlipStreamChat": FlipStreamChat,
+ "FlipStreamParseJson": FlipStreamParseJson,
"FlipStreamBatchPrompt": FlipStreamBatchPrompt,
"FlipStreamFilmVfi": FlipStreamFilmVfi,
"FlipStreamViewer": FlipStreamViewer,
@@ -2651,6 +2727,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"FlipStreamFileSelect_Input": "FlipStreamFileSelect_Input",
"FlipStreamFileSelect_Output": "FlipStreamFileSelect_Output",
"FlipStreamPreviewBox": "FlipStreamPreviewBox",
+ "FlipStreamLogBox": "FlipStreamLogBox",
"FlipStreamSetUpdateAndReload": "FlipStreamSetUpdateAndReload",
"FlipStreamSetMessage": "FlipStreamSetMessage",
"FlipStreamSetParam": "FlipStreamSetParam",
@@ -2668,6 +2745,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"FlipStreamRembg": "FlipStreamRembg",
"FlipStreamSegMask": "FlipStreamSegMask",
"FlipStreamChat": "FlipStreamChat",
+ "FlipStreamParseJson": "FlipStreamParseJson",
"FlipStreamBatchPrompt": "FlipStreamBatchPrompt",
"FlipStreamFilmVfi": "FlipStreamFilmVfi",
"FlipStreamViewer": "FlipStreamViewer",