mirror of
https://github.com/NicolasBohn/NexQuant.git
synced 2026-08-08 04:27:44 +00:00
CI checks that can be automatically repaired (#119)
* fix isort & black & toml-sort & sphinx error * fix ci error * fix ci error * add comments * Update Makefile * change sphinx build command * add auto-lint * add black args * format with black * Auto Linting document * fix ci error --------- Co-authored-by: you-n-g <you-n-g@users.noreply.github.com> Co-authored-by: Young <afe.young@gmail.com>
This commit is contained in:
+8
-4
@@ -2,19 +2,22 @@ from __future__ import annotations
|
||||
|
||||
from abc import abstractmethod
|
||||
from collections.abc import Generator
|
||||
from dataclasses import dataclass
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from typing import Literal, Optional, Union, Literal
|
||||
from dataclasses import dataclass
|
||||
from typing import Literal, Optional, Union
|
||||
|
||||
|
||||
@dataclass
|
||||
class Message:
|
||||
"""The info unit of the storage"""
|
||||
|
||||
tag: str # namespace like like a.b.c
|
||||
level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] # The level of the logging
|
||||
timestamp: datetime # The time when the message is generated
|
||||
caller: Optional[str] # The caller of the logging like `rdagent.oai.llm_utils:_create_chat_completion_inner_function:55`(file:func:line)
|
||||
caller: Optional[
|
||||
str
|
||||
] # The caller of the logging like `rdagent.oai.llm_utils:_create_chat_completion_inner_function:55`(file:func:line)
|
||||
pid_trace: Optional[str] # The process id trace; A-B-C represents A create B, B create C
|
||||
content: object # The content
|
||||
|
||||
@@ -39,7 +42,8 @@ class Storage:
|
||||
@abstractmethod
|
||||
def log(
|
||||
self,
|
||||
obj: object, name: str = "",
|
||||
obj: object,
|
||||
name: str = "",
|
||||
save_type: Literal["json", "text", "pkl"] = "text",
|
||||
timestamp: datetime | None = None,
|
||||
**kwargs: dict,
|
||||
|
||||
@@ -3,15 +3,17 @@ import sys
|
||||
from contextlib import contextmanager
|
||||
from datetime import datetime, timezone
|
||||
from functools import partial
|
||||
from logging import LogRecord
|
||||
from multiprocessing import Pipe
|
||||
from multiprocessing.connection import Connection
|
||||
from pathlib import Path
|
||||
from typing import TYPE_CHECKING, Union, Generator, Dict, Any
|
||||
from logging import LogRecord
|
||||
from typing import TYPE_CHECKING, Any, Dict, Generator, Union
|
||||
|
||||
from loguru import logger
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from loguru import Record
|
||||
|
||||
from psutil import Process
|
||||
|
||||
from rdagent.core.conf import RD_AGENT_SETTINGS
|
||||
|
||||
+5
-12
@@ -1,9 +1,9 @@
|
||||
import re
|
||||
import json
|
||||
import pickle
|
||||
import re
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Literal, Generator, Union, Any, cast
|
||||
from typing import Any, Generator, Literal, Union, cast
|
||||
|
||||
from .base import Message, Storage
|
||||
|
||||
@@ -17,7 +17,6 @@ class FileStorage(Storage):
|
||||
TODO: describe the storage format
|
||||
"""
|
||||
|
||||
|
||||
def __init__(self, path: str | Path = "./log/") -> None:
|
||||
self.path = Path(path)
|
||||
self.path.mkdir(parents=True, exist_ok=True)
|
||||
@@ -69,7 +68,7 @@ class FileStorage(Storage):
|
||||
def iter_msg(self, watch: bool = False) -> Generator[Message, None, None]:
|
||||
msg_l = []
|
||||
for file in self.path.glob("**/*.log"):
|
||||
tag = '.'.join(str(file.relative_to(self.path)).replace("/", ".").split(".")[:-3])
|
||||
tag = ".".join(str(file.relative_to(self.path)).replace("/", ".").split(".")[:-3])
|
||||
pid = file.parent.name
|
||||
|
||||
with file.open("r") as f:
|
||||
@@ -92,12 +91,7 @@ class FileStorage(Storage):
|
||||
message_content = content[message_start:message_end].strip()
|
||||
|
||||
m = Message(
|
||||
tag=tag,
|
||||
level=level,
|
||||
timestamp=timestamp,
|
||||
caller=caller,
|
||||
pid_trace=pid,
|
||||
content=message_content
|
||||
tag=tag, level=level, timestamp=timestamp, caller=caller, pid_trace=pid, content=message_content
|
||||
)
|
||||
|
||||
if isinstance(m.content, str) and "Logging object in" in m.content:
|
||||
@@ -119,7 +113,6 @@ class FileStorage(Storage):
|
||||
def truncate(self, time: datetime) -> None:
|
||||
# any message later than `time` will be removed
|
||||
for file in self.path.glob("**/*.log"):
|
||||
|
||||
with file.open("r") as f:
|
||||
content = f.read()
|
||||
|
||||
@@ -135,7 +128,7 @@ class FileStorage(Storage):
|
||||
|
||||
log_start = match.start()
|
||||
log_end = next_match.start() if next_match else len(content)
|
||||
msg = content[match.end():log_end].strip()
|
||||
msg = content[match.end() : log_end].strip()
|
||||
|
||||
if timestamp > time:
|
||||
if "Logging object in" in msg:
|
||||
|
||||
+10
-4
@@ -1,9 +1,15 @@
|
||||
from rdagent.log.ui.web import WebView, SimpleTraceWindow, TraceObjWindow, mock_msg, TraceWindow
|
||||
from rdagent.log.storage import FileStorage, Message
|
||||
from rdagent.core.proposal import Trace
|
||||
from pathlib import Path
|
||||
import pickle
|
||||
from pathlib import Path
|
||||
|
||||
from rdagent.core.proposal import Trace
|
||||
from rdagent.log.storage import FileStorage, Message
|
||||
from rdagent.log.ui.web import (
|
||||
SimpleTraceWindow,
|
||||
TraceObjWindow,
|
||||
TraceWindow,
|
||||
WebView,
|
||||
mock_msg,
|
||||
)
|
||||
|
||||
# show logs folder
|
||||
WebView(TraceWindow()).display(FileStorage("/data/home/bowen/workspace/RD-Agent/log/yuante/2024-07-24_04-03-33-691119"))
|
||||
|
||||
@@ -123,4 +123,4 @@ if __name__ == "__main__":
|
||||
|
||||
st.container(border=True).write("This is a regular container.")
|
||||
for i in range(30):
|
||||
st.write(f"Line {i}")
|
||||
st.write(f"Line {i}")
|
||||
|
||||
+218
-192
@@ -1,51 +1,45 @@
|
||||
import pandas as pd
|
||||
import streamlit as st
|
||||
import plotly.express as px
|
||||
import time
|
||||
|
||||
from rdagent.log.base import Storage, View
|
||||
from rdagent.log.base import Message
|
||||
from datetime import timezone, datetime
|
||||
from collections import defaultdict
|
||||
from copy import deepcopy
|
||||
from rdagent.core.proposal import Trace
|
||||
|
||||
from datetime import datetime, timezone
|
||||
from typing import Callable, Type
|
||||
from streamlit.delta_generator import DeltaGenerator
|
||||
from rdagent.core.proposal import Hypothesis, HypothesisFeedback
|
||||
|
||||
import pandas as pd
|
||||
import plotly.express as px
|
||||
import streamlit as st
|
||||
from streamlit.delta_generator import DeltaGenerator
|
||||
|
||||
from rdagent.components.coder.factor_coder.CoSTEER.evaluators import (
|
||||
FactorSingleFeedback,
|
||||
)
|
||||
from rdagent.components.coder.factor_coder.factor import FactorFBWorkspace, FactorTask
|
||||
from rdagent.components.coder.model_coder.CoSTEER.evaluators import ModelCoderFeedback
|
||||
from rdagent.components.coder.model_coder.model import ModelFBWorkspace, ModelTask
|
||||
from rdagent.core.proposal import Hypothesis, HypothesisFeedback, Trace
|
||||
from rdagent.log.base import Message, Storage, View
|
||||
from rdagent.scenarios.qlib.experiment.factor_experiment import QlibFactorExperiment
|
||||
from rdagent.scenarios.qlib.experiment.model_experiment import QlibModelExperiment
|
||||
|
||||
from rdagent.components.coder.factor_coder.factor import FactorTask, FactorFBWorkspace
|
||||
from rdagent.components.coder.factor_coder.CoSTEER.evaluators import FactorSingleFeedback
|
||||
from rdagent.components.coder.model_coder.CoSTEER.evaluators import ModelCoderFeedback
|
||||
from rdagent.components.coder.model_coder.model import ModelTask, ModelFBWorkspace
|
||||
|
||||
|
||||
st.set_page_config(layout="wide")
|
||||
|
||||
TIME_DELAY = 0.001
|
||||
|
||||
class WebView(View):
|
||||
|
||||
def __init__(self, ui: 'StWindow'):
|
||||
class WebView(View):
|
||||
def __init__(self, ui: "StWindow"):
|
||||
self.ui = ui
|
||||
# Save logs to your desired data structure
|
||||
# ...
|
||||
|
||||
def display(self, s: Storage, watch: bool = False):
|
||||
|
||||
for msg in s.iter_msg(): # iterate overtime
|
||||
# NOTE: iter_msg will correctly seperate the information.
|
||||
# TODO: msg may support streaming mode.
|
||||
self.ui.consume_msg(msg)
|
||||
|
||||
|
||||
|
||||
class StWindow:
|
||||
|
||||
def __init__(self, container: 'DeltaGenerator'):
|
||||
def __init__(self, container: "DeltaGenerator"):
|
||||
self.container = container
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
@@ -54,31 +48,32 @@ class StWindow:
|
||||
|
||||
|
||||
class LLMWindow(StWindow):
|
||||
def __init__(self, container: 'DeltaGenerator', session_name: str="common"):
|
||||
def __init__(self, container: "DeltaGenerator", session_name: str = "common"):
|
||||
self.session_name = session_name
|
||||
self.container = container.expander(f"{self.session_name} message")
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
self.container.chat_message('user').markdown(f"{msg.content}")
|
||||
self.container.chat_message("user").markdown(f"{msg.content}")
|
||||
|
||||
|
||||
class ProgressTabsWindow(StWindow):
|
||||
'''
|
||||
"""
|
||||
For windows with stream messages, will refresh when a new tab is created.
|
||||
'''
|
||||
def __init__(self,
|
||||
container: 'DeltaGenerator',
|
||||
inner_class: Type[StWindow] = StWindow,
|
||||
mapper: Callable[[Message], str] = lambda x: x.pid_trace):
|
||||
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
container: "DeltaGenerator",
|
||||
inner_class: Type[StWindow] = StWindow,
|
||||
mapper: Callable[[Message], str] = lambda x: x.pid_trace,
|
||||
):
|
||||
self.inner_class = inner_class
|
||||
self.mapper = mapper
|
||||
|
||||
self.container = container.empty()
|
||||
self.tab_windows: dict[str, StWindow] = defaultdict(None)
|
||||
self.tab_caches: dict[str, list[Message]] = defaultdict(list)
|
||||
|
||||
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
name = self.mapper(msg)
|
||||
|
||||
@@ -93,61 +88,67 @@ class ProgressTabsWindow(StWindow):
|
||||
|
||||
for id, name in enumerate(names):
|
||||
self.tab_windows[name] = self.inner_class(tabs[id])
|
||||
|
||||
|
||||
# consume the cache
|
||||
for name in self.tab_caches:
|
||||
for msg in self.tab_caches[name]:
|
||||
self.tab_windows[name].consume_msg(msg)
|
||||
|
||||
|
||||
self.tab_caches[name].append(msg)
|
||||
self.tab_windows[name].consume_msg(msg)
|
||||
|
||||
|
||||
class ObjectsTabsWindow(StWindow):
|
||||
def __init__(self,
|
||||
container: 'DeltaGenerator',
|
||||
inner_class: Type[StWindow] = StWindow,
|
||||
mapper: Callable[[object], str] = lambda x: str(x),
|
||||
tab_names: list[str] | None = None):
|
||||
def __init__(
|
||||
self,
|
||||
container: "DeltaGenerator",
|
||||
inner_class: Type[StWindow] = StWindow,
|
||||
mapper: Callable[[object], str] = lambda x: str(x),
|
||||
tab_names: list[str] | None = None,
|
||||
):
|
||||
self.inner_class = inner_class
|
||||
self.mapper = mapper
|
||||
self.container = container
|
||||
self.tab_names = tab_names
|
||||
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
if isinstance(msg.content, list):
|
||||
if self.tab_names:
|
||||
assert len(self.tab_names) == len(msg.content), "List of objects should have the same length as provided tab names."
|
||||
assert len(self.tab_names) == len(
|
||||
msg.content
|
||||
), "List of objects should have the same length as provided tab names."
|
||||
objs_dict = {self.tab_names[id]: obj for id, obj in enumerate(msg.content)}
|
||||
else:
|
||||
objs_dict = {self.mapper(obj): obj for obj in msg.content}
|
||||
elif not isinstance(msg.content, dict):
|
||||
raise ValueError("Message content should be a list or a dict of objects.")
|
||||
|
||||
|
||||
# two many tabs may cause display problem
|
||||
tab_names = list(objs_dict.keys())
|
||||
tabs = []
|
||||
for i in range(0, len(tab_names), 10):
|
||||
tabs.extend(self.container.tabs(tab_names[i:i+10]))
|
||||
|
||||
tabs.extend(self.container.tabs(tab_names[i : i + 10]))
|
||||
|
||||
for id, obj in enumerate(objs_dict.values()):
|
||||
splited_msg = Message(tag=msg.tag,
|
||||
level=msg.level,
|
||||
timestamp=msg.timestamp,
|
||||
caller=msg.caller,
|
||||
pid_trace=msg.pid_trace,
|
||||
content=obj)
|
||||
splited_msg = Message(
|
||||
tag=msg.tag,
|
||||
level=msg.level,
|
||||
timestamp=msg.timestamp,
|
||||
caller=msg.caller,
|
||||
pid_trace=msg.pid_trace,
|
||||
content=obj,
|
||||
)
|
||||
self.inner_class(tabs[id]).consume_msg(splited_msg)
|
||||
|
||||
|
||||
class RoundTabsWindow(StWindow):
|
||||
|
||||
def __init__(self,
|
||||
container: 'DeltaGenerator',
|
||||
new_tab_func: Callable[[Message], bool],
|
||||
inner_class: Type[StWindow] = StWindow,
|
||||
title: str = 'Round tabs'):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
container: "DeltaGenerator",
|
||||
new_tab_func: Callable[[Message], bool],
|
||||
inner_class: Type[StWindow] = StWindow,
|
||||
title: str = "Round tabs",
|
||||
):
|
||||
container.markdown(f"### **{title}**")
|
||||
self.inner_class = inner_class
|
||||
self.new_tab_func = new_tab_func
|
||||
@@ -156,42 +157,42 @@ class RoundTabsWindow(StWindow):
|
||||
self.current_win = StWindow(container)
|
||||
self.tabs_c = container.empty()
|
||||
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
if self.new_tab_func(msg):
|
||||
self.round += 1
|
||||
self.current_win = self.inner_class(self.tabs_c.tabs([str(i) for i in range(1, self.round+1)])[-1])
|
||||
self.current_win = self.inner_class(self.tabs_c.tabs([str(i) for i in range(1, self.round + 1)])[-1])
|
||||
|
||||
self.current_win.consume_msg(msg)
|
||||
|
||||
|
||||
class HypothesisWindow(StWindow):
|
||||
|
||||
def consume_msg(self, msg: Message | Hypothesis):
|
||||
h: Hypothesis = msg.content if isinstance(msg, Message) else msg
|
||||
|
||||
self.container.markdown('#### **Hypothesis💡**')
|
||||
self.container.markdown(f"""
|
||||
self.container.markdown("#### **Hypothesis💡**")
|
||||
self.container.markdown(
|
||||
f"""
|
||||
- **Hypothesis**: {h.hypothesis}
|
||||
- **Reason**: {h.reason}""")
|
||||
- **Reason**: {h.reason}"""
|
||||
)
|
||||
|
||||
|
||||
class HypothesisFeedbackWindow(StWindow):
|
||||
|
||||
def consume_msg(self, msg: Message | HypothesisFeedback):
|
||||
h: HypothesisFeedback = msg.content if isinstance(msg, Message) else msg
|
||||
|
||||
self.container.markdown('#### **Hypothesis Feedback🔍**')
|
||||
self.container.markdown(f"""
|
||||
self.container.markdown("#### **Hypothesis Feedback🔍**")
|
||||
self.container.markdown(
|
||||
f"""
|
||||
- **Observations**: {h.observations}
|
||||
- **Hypothesis Evaluation**: {h.hypothesis_evaluation}
|
||||
- **New Hypothesis**: {h.new_hypothesis}
|
||||
- **Decision**: {h.decision}
|
||||
- **Reason**: {h.reason}""")
|
||||
- **Reason**: {h.reason}"""
|
||||
)
|
||||
|
||||
|
||||
class FactorTaskWindow(StWindow):
|
||||
|
||||
def consume_msg(self, msg: Message | FactorTask):
|
||||
ft: FactorTask = msg.content if isinstance(msg, Message) else msg
|
||||
|
||||
@@ -199,14 +200,13 @@ class FactorTaskWindow(StWindow):
|
||||
self.container.markdown(f"**Description**: {ft.factor_description}")
|
||||
self.container.latex(f"Formulation: {ft.factor_formulation}")
|
||||
|
||||
variables_df = pd.DataFrame(ft.variables, index=['Description']).T
|
||||
variables_df.index.name = 'Variable'
|
||||
variables_df = pd.DataFrame(ft.variables, index=["Description"]).T
|
||||
variables_df.index.name = "Variable"
|
||||
self.container.table(variables_df)
|
||||
self.container.text(f"Factor resources: {ft.factor_resources}")
|
||||
|
||||
|
||||
class ModelTaskWindow(StWindow):
|
||||
|
||||
def consume_msg(self, msg: Message | ModelTask):
|
||||
mt: ModelTask = msg.content if isinstance(msg, Message) else msg
|
||||
|
||||
@@ -214,18 +214,18 @@ class ModelTaskWindow(StWindow):
|
||||
self.container.markdown(f"**Model Type**: {mt.model_type}")
|
||||
self.container.markdown(f"**Description**: {mt.description}")
|
||||
self.container.markdown(f"**Formulation**: {mt.formulation}")
|
||||
|
||||
variables_df = pd.DataFrame(mt.variables, index=['Value']).T
|
||||
variables_df.index.name = 'Variable'
|
||||
|
||||
variables_df = pd.DataFrame(mt.variables, index=["Value"]).T
|
||||
variables_df.index.name = "Variable"
|
||||
self.container.table(variables_df)
|
||||
|
||||
|
||||
class FactorFeedbackWindow(StWindow):
|
||||
|
||||
def consume_msg(self, msg: Message | FactorSingleFeedback):
|
||||
fb: FactorSingleFeedback = msg.content if isinstance(msg, Message) else msg
|
||||
|
||||
self.container.markdown(f"""### :blue[Factor Execution Feedback]
|
||||
self.container.markdown(
|
||||
f"""### :blue[Factor Execution Feedback]
|
||||
{fb.execution_feedback}
|
||||
### :blue[Factor Code Feedback]
|
||||
{fb.code_feedback}
|
||||
@@ -235,15 +235,16 @@ class FactorFeedbackWindow(StWindow):
|
||||
{fb.final_feedback}
|
||||
### :blue[Factor Final Decision]
|
||||
This implementation is {'SUCCESS' if fb.final_decision else 'FAIL'}.
|
||||
""")
|
||||
"""
|
||||
)
|
||||
|
||||
|
||||
class ModelFeedbackWindow(StWindow):
|
||||
|
||||
def consume_msg(self, msg: Message | ModelCoderFeedback):
|
||||
mb: ModelCoderFeedback = msg.content if isinstance(msg, Message) else msg
|
||||
|
||||
self.container.markdown(f"""### :blue[Model Execution Feedback]
|
||||
self.container.markdown(
|
||||
f"""### :blue[Model Execution Feedback]
|
||||
{mb.execution_feedback}
|
||||
### :blue[Model Shape Feedback]
|
||||
{mb.shape_feedback}
|
||||
@@ -255,11 +256,12 @@ class ModelFeedbackWindow(StWindow):
|
||||
{mb.final_feedback}
|
||||
### :blue[Model Final Decision]
|
||||
This implementation is {'SUCCESS' if mb.final_decision else 'FAIL'}.
|
||||
""")
|
||||
"""
|
||||
)
|
||||
|
||||
|
||||
class WorkspaceWindow(StWindow):
|
||||
def __init__(self, container: 'DeltaGenerator', show_task_info: bool = False):
|
||||
def __init__(self, container: "DeltaGenerator", show_task_info: bool = False):
|
||||
self.container = container
|
||||
self.show_task_info = show_task_info
|
||||
|
||||
@@ -267,21 +269,22 @@ class WorkspaceWindow(StWindow):
|
||||
ws: FactorFBWorkspace | ModelFBWorkspace = msg.content if isinstance(msg, Message) else msg
|
||||
|
||||
# no workspace
|
||||
if ws is None: return
|
||||
if ws is None:
|
||||
return
|
||||
|
||||
# task info
|
||||
if self.show_task_info:
|
||||
task_msg = deepcopy(msg)
|
||||
task_msg.content = ws.target_task
|
||||
if isinstance(ws, FactorFBWorkspace):
|
||||
self.container.subheader('Factor Info')
|
||||
self.container.subheader("Factor Info")
|
||||
FactorTaskWindow(self.container.container()).consume_msg(task_msg)
|
||||
else:
|
||||
self.container.subheader('Model Info')
|
||||
self.container.subheader("Model Info")
|
||||
ModelTaskWindow(self.container.container()).consume_msg(task_msg)
|
||||
|
||||
# task codes
|
||||
for k,v in ws.code_dict.items():
|
||||
for k, v in ws.code_dict.items():
|
||||
self.container.markdown(f"`{k}`")
|
||||
self.container.code(v, language="python")
|
||||
|
||||
@@ -302,24 +305,25 @@ class QlibFactorExpWindow(StWindow):
|
||||
if self.show_task_info:
|
||||
ftm_msg = deepcopy(msg)
|
||||
ftm_msg.content = [ws for ws in exp.sub_workspace_list if ws]
|
||||
self.container.markdown('**Factor Tasks**')
|
||||
ObjectsTabsWindow(self.container.container(),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.factor_name,
|
||||
).consume_msg(ftm_msg)
|
||||
self.container.markdown("**Factor Tasks**")
|
||||
ObjectsTabsWindow(
|
||||
self.container.container(),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.factor_name,
|
||||
).consume_msg(ftm_msg)
|
||||
|
||||
# result
|
||||
self.container.markdown('**Results**')
|
||||
results = pd.DataFrame({f'base_exp_{id}':e.result for id, e in enumerate(exp.based_experiments)})
|
||||
results['now'] = exp.result
|
||||
self.container.markdown("**Results**")
|
||||
results = pd.DataFrame({f"base_exp_{id}": e.result for id, e in enumerate(exp.based_experiments)})
|
||||
results["now"] = exp.result
|
||||
|
||||
self.container.expander('results table').table(results)
|
||||
self.container.expander("results table").table(results)
|
||||
|
||||
try:
|
||||
bar_chart = px.bar(results, orientation='h', barmode='group')
|
||||
self.container.expander('results chart').plotly_chart(bar_chart)
|
||||
bar_chart = px.bar(results, orientation="h", barmode="group")
|
||||
self.container.expander("results chart").plotly_chart(bar_chart)
|
||||
except:
|
||||
self.container.text('Results are incomplete.')
|
||||
self.container.text("Results are incomplete.")
|
||||
|
||||
|
||||
class QlibModelExpWindow(StWindow):
|
||||
@@ -334,44 +338,45 @@ class QlibModelExpWindow(StWindow):
|
||||
if self.show_task_info:
|
||||
_msg = deepcopy(msg)
|
||||
_msg.content = [ws for ws in exp.sub_workspace_list if ws]
|
||||
self.container.markdown('**Model Tasks**')
|
||||
ObjectsTabsWindow(self.container.container(),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.name,
|
||||
).consume_msg(_msg)
|
||||
self.container.markdown("**Model Tasks**")
|
||||
ObjectsTabsWindow(
|
||||
self.container.container(),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.name,
|
||||
).consume_msg(_msg)
|
||||
|
||||
# result
|
||||
self.container.subheader('Results', divider=True)
|
||||
results = pd.DataFrame({f'base_exp_{id}':e.result for id, e in enumerate(exp.based_experiments)})
|
||||
results['now'] = exp.result
|
||||
self.container.subheader("Results", divider=True)
|
||||
results = pd.DataFrame({f"base_exp_{id}": e.result for id, e in enumerate(exp.based_experiments)})
|
||||
results["now"] = exp.result
|
||||
|
||||
self.container.expander('results table').table(results)
|
||||
self.container.expander("results table").table(results)
|
||||
|
||||
|
||||
class SimpleTraceWindow(StWindow):
|
||||
|
||||
def __init__(self, container: 'DeltaGenerator' = st.container(), show_llm: bool = False, show_common_logs: bool = False):
|
||||
def __init__(
|
||||
self, container: "DeltaGenerator" = st.container(), show_llm: bool = False, show_common_logs: bool = False
|
||||
):
|
||||
super().__init__(container)
|
||||
self.show_llm = show_llm
|
||||
self.show_common_logs = show_common_logs
|
||||
self.pid_trace = ''
|
||||
self.current_tag = ''
|
||||
self.pid_trace = ""
|
||||
self.current_tag = ""
|
||||
|
||||
self.current_win = StWindow(self.container)
|
||||
self.evolving_tasks: list[str] = []
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
|
||||
# divide tag levels
|
||||
if len(msg.tag) > len(self.current_tag):
|
||||
# write a header about current task, if it is llm message, not write.
|
||||
if not msg.tag.endswith('llm_messages'):
|
||||
self.container.header(msg.tag.replace('.', ' ➡ '), divider=True)
|
||||
|
||||
if not msg.tag.endswith("llm_messages"):
|
||||
self.container.header(msg.tag.replace(".", " ➡ "), divider=True)
|
||||
|
||||
self.current_tag = msg.tag
|
||||
|
||||
# set log writer (window) according to msg
|
||||
if msg.tag.endswith('llm_messages'):
|
||||
if msg.tag.endswith("llm_messages"):
|
||||
# llm messages logs
|
||||
if not self.show_llm:
|
||||
return
|
||||
@@ -392,29 +397,41 @@ class SimpleTraceWindow(StWindow):
|
||||
if len(msg.content) == 0:
|
||||
return
|
||||
if isinstance(msg.content[0], FactorTask):
|
||||
self.current_win = ObjectsTabsWindow(self.container.expander('Factor Tasks'), FactorTaskWindow, lambda x: x.factor_name)
|
||||
self.current_win = ObjectsTabsWindow(
|
||||
self.container.expander("Factor Tasks"), FactorTaskWindow, lambda x: x.factor_name
|
||||
)
|
||||
elif isinstance(msg.content[0], ModelTask):
|
||||
self.current_win = ObjectsTabsWindow(self.container.expander('Model Tasks'), ModelTaskWindow, lambda x: x.name)
|
||||
|
||||
self.current_win = ObjectsTabsWindow(
|
||||
self.container.expander("Model Tasks"), ModelTaskWindow, lambda x: x.name
|
||||
)
|
||||
|
||||
elif isinstance(msg.content[0], FactorFBWorkspace):
|
||||
self.current_win = ObjectsTabsWindow(self.container.expander('Factor Workspaces'),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.factor_name)
|
||||
self.current_win = ObjectsTabsWindow(
|
||||
self.container.expander("Factor Workspaces"),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.factor_name,
|
||||
)
|
||||
self.evolving_tasks = [m.target_task.factor_name for m in msg.content]
|
||||
elif isinstance(msg.content[0], ModelFBWorkspace):
|
||||
self.current_win = ObjectsTabsWindow(self.container.expander('Model Workspaces'),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.name)
|
||||
self.current_win = ObjectsTabsWindow(
|
||||
self.container.expander("Model Workspaces"),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.name,
|
||||
)
|
||||
self.evolving_tasks = [m.target_task.name for m in msg.content]
|
||||
|
||||
elif isinstance(msg.content[0], FactorSingleFeedback):
|
||||
self.current_win = ObjectsTabsWindow(self.container.expander('Factor Feedbacks'),
|
||||
inner_class=FactorFeedbackWindow,
|
||||
tab_names=self.evolving_tasks)
|
||||
self.current_win = ObjectsTabsWindow(
|
||||
self.container.expander("Factor Feedbacks"),
|
||||
inner_class=FactorFeedbackWindow,
|
||||
tab_names=self.evolving_tasks,
|
||||
)
|
||||
elif isinstance(msg.content[0], ModelCoderFeedback):
|
||||
self.current_win = ObjectsTabsWindow(self.container.expander('Model Feedbacks'),
|
||||
inner_class=ModelFeedbackWindow,
|
||||
tab_names=self.evolving_tasks)
|
||||
self.current_win = ObjectsTabsWindow(
|
||||
self.container.expander("Model Feedbacks"),
|
||||
inner_class=ModelFeedbackWindow,
|
||||
tab_names=self.evolving_tasks,
|
||||
)
|
||||
else:
|
||||
# common logs
|
||||
if not self.show_common_logs:
|
||||
@@ -425,12 +442,11 @@ class SimpleTraceWindow(StWindow):
|
||||
|
||||
|
||||
def mock_msg(obj) -> Message:
|
||||
return Message(tag='mock', level='INFO', timestamp=datetime.now(), pid_trace='000', caller='mock',content=obj)
|
||||
return Message(tag="mock", level="INFO", timestamp=datetime.now(), pid_trace="000", caller="mock", content=obj)
|
||||
|
||||
|
||||
class TraceObjWindow(StWindow):
|
||||
|
||||
def __init__(self, container: 'DeltaGenerator' = st.container()):
|
||||
def __init__(self, container: "DeltaGenerator" = st.container()):
|
||||
self.container = container
|
||||
|
||||
def consume_msg(self, msg: Message | Trace):
|
||||
@@ -440,7 +456,7 @@ class TraceObjWindow(StWindow):
|
||||
trace = msg
|
||||
|
||||
for id, (h, e, hf) in enumerate(trace.hist):
|
||||
self.container.header(f'Trace History {id}', divider=True)
|
||||
self.container.header(f"Trace History {id}", divider=True)
|
||||
HypothesisWindow(self.container).consume_msg(mock_msg(h))
|
||||
if isinstance(e, QlibFactorExperiment):
|
||||
QlibFactorExpWindow(self.container).consume_msg(mock_msg(e))
|
||||
@@ -450,70 +466,74 @@ class TraceObjWindow(StWindow):
|
||||
|
||||
|
||||
class ResearchWindow(StWindow):
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
if msg.tag.endswith('hypothesis generation'):
|
||||
if msg.tag.endswith("hypothesis generation"):
|
||||
HypothesisWindow(self.container.container()).consume_msg(msg)
|
||||
elif msg.tag.endswith('experiment generation'):
|
||||
elif msg.tag.endswith("experiment generation"):
|
||||
if isinstance(msg.content, list):
|
||||
if isinstance(msg.content[0], FactorTask):
|
||||
self.container.markdown('**Factor Tasks**')
|
||||
ObjectsTabsWindow(self.container.container(), FactorTaskWindow, lambda x: x.factor_name).consume_msg(msg)
|
||||
self.container.markdown("**Factor Tasks**")
|
||||
ObjectsTabsWindow(
|
||||
self.container.container(), FactorTaskWindow, lambda x: x.factor_name
|
||||
).consume_msg(msg)
|
||||
elif isinstance(msg.content[0], ModelTask):
|
||||
self.container.markdown('**Model Tasks**')
|
||||
self.container.markdown("**Model Tasks**")
|
||||
ObjectsTabsWindow(self.container.container(), ModelTaskWindow, lambda x: x.name).consume_msg(msg)
|
||||
|
||||
|
||||
class EvolvingWindow(StWindow):
|
||||
def __init__(self, container: 'DeltaGenerator'):
|
||||
def __init__(self, container: "DeltaGenerator"):
|
||||
self.container = container
|
||||
self.evolving_tasks: list[str] = []
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
if msg.tag.endswith('evolving code'):
|
||||
if msg.tag.endswith("evolving code"):
|
||||
if isinstance(msg.content, list):
|
||||
msg.content = [m for m in msg.content if m]
|
||||
if len(msg.content) == 0:
|
||||
return
|
||||
if isinstance(msg.content[0], FactorFBWorkspace):
|
||||
self.container.markdown('**Factor Codes**')
|
||||
ObjectsTabsWindow(self.container.container(),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.factor_name).consume_msg(msg)
|
||||
self.container.markdown("**Factor Codes**")
|
||||
ObjectsTabsWindow(
|
||||
self.container.container(),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.factor_name,
|
||||
).consume_msg(msg)
|
||||
self.evolving_tasks = [m.target_task.factor_name for m in msg.content]
|
||||
elif isinstance(msg.content[0], ModelFBWorkspace):
|
||||
self.container.markdown('**Model Codes**')
|
||||
ObjectsTabsWindow(self.container.container(),
|
||||
inner_class=WorkspaceWindow,
|
||||
mapper=lambda x: x.target_task.name).consume_msg(msg)
|
||||
self.container.markdown("**Model Codes**")
|
||||
ObjectsTabsWindow(
|
||||
self.container.container(), inner_class=WorkspaceWindow, mapper=lambda x: x.target_task.name
|
||||
).consume_msg(msg)
|
||||
self.evolving_tasks = [m.target_task.name for m in msg.content]
|
||||
elif msg.tag.endswith('evolving feedback'):
|
||||
elif msg.tag.endswith("evolving feedback"):
|
||||
if isinstance(msg.content, list):
|
||||
msg.content = [m for m in msg.content if m]
|
||||
if len(msg.content) == 0:
|
||||
return
|
||||
if isinstance(msg.content[0], FactorSingleFeedback):
|
||||
self.container.markdown('**Factor Feedbacks🔍**')
|
||||
ObjectsTabsWindow(self.container.container(),
|
||||
inner_class=FactorFeedbackWindow,
|
||||
tab_names=self.evolving_tasks).consume_msg(msg)
|
||||
self.container.markdown("**Factor Feedbacks🔍**")
|
||||
ObjectsTabsWindow(
|
||||
self.container.container(), inner_class=FactorFeedbackWindow, tab_names=self.evolving_tasks
|
||||
).consume_msg(msg)
|
||||
elif isinstance(msg.content[0], ModelCoderFeedback):
|
||||
self.container.markdown('**Model Feedbacks🔍**')
|
||||
ObjectsTabsWindow(self.container.container(),
|
||||
inner_class=ModelFeedbackWindow,
|
||||
tab_names=self.evolving_tasks).consume_msg(msg)
|
||||
self.container.markdown("**Model Feedbacks🔍**")
|
||||
ObjectsTabsWindow(
|
||||
self.container.container(), inner_class=ModelFeedbackWindow, tab_names=self.evolving_tasks
|
||||
).consume_msg(msg)
|
||||
|
||||
|
||||
class DevelopmentWindow(StWindow):
|
||||
|
||||
def __init__(self, container: 'DeltaGenerator'):
|
||||
self.E_win = RoundTabsWindow(container.container(),
|
||||
new_tab_func=lambda x: x.tag.endswith('evolving code'),
|
||||
inner_class=EvolvingWindow,
|
||||
title='Evolving Loops🔧')
|
||||
def __init__(self, container: "DeltaGenerator"):
|
||||
self.E_win = RoundTabsWindow(
|
||||
container.container(),
|
||||
new_tab_func=lambda x: x.tag.endswith("evolving code"),
|
||||
inner_class=EvolvingWindow,
|
||||
title="Evolving Loops🔧",
|
||||
)
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
if 'evolving' in msg.tag:
|
||||
if "evolving" in msg.tag:
|
||||
self.E_win.consume_msg(msg)
|
||||
# elif msg.tag.endswith('result'):
|
||||
# self.container.subheader('Results')
|
||||
@@ -528,8 +548,7 @@ class DevelopmentWindow(StWindow):
|
||||
|
||||
|
||||
class FeedbackWindow(StWindow):
|
||||
|
||||
def __init__(self, container: 'DeltaGenerator'):
|
||||
def __init__(self, container: "DeltaGenerator"):
|
||||
self.container = container
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
@@ -542,8 +561,7 @@ class FeedbackWindow(StWindow):
|
||||
|
||||
|
||||
class SingleRDLoopWindow(StWindow):
|
||||
|
||||
def __init__(self, container: 'DeltaGenerator'):
|
||||
def __init__(self, container: "DeltaGenerator"):
|
||||
self.container = container
|
||||
col1, col2 = self.container.columns([2, 3])
|
||||
self.R_win = ResearchWindow(col1.container(border=True))
|
||||
@@ -551,58 +569,66 @@ class SingleRDLoopWindow(StWindow):
|
||||
self.D_win = DevelopmentWindow(col2.container(border=True))
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
tags = msg.tag.split('.')
|
||||
if 'r' in tags:
|
||||
tags = msg.tag.split(".")
|
||||
if "r" in tags:
|
||||
self.R_win.consume_msg(msg)
|
||||
elif 'd' in tags:
|
||||
elif "d" in tags:
|
||||
self.D_win.consume_msg(msg)
|
||||
elif 'ef' in tags:
|
||||
elif "ef" in tags:
|
||||
self.F_win.consume_msg(msg)
|
||||
|
||||
|
||||
class TraceWindow(StWindow):
|
||||
|
||||
def __init__(self, container: 'DeltaGenerator' = st.container(), show_llm: bool = False, show_common_logs: bool = False):
|
||||
def __init__(
|
||||
self, container: "DeltaGenerator" = st.container(), show_llm: bool = False, show_common_logs: bool = False
|
||||
):
|
||||
self.show_llm = show_llm
|
||||
self.show_common_logs = show_common_logs
|
||||
|
||||
top_container = container.container()
|
||||
col1, col2 = top_container.columns([2,3])
|
||||
col1, col2 = top_container.columns([2, 3])
|
||||
chart_c = col2.container(border=True, height=300)
|
||||
chart_c.markdown('**Metrics📈**')
|
||||
chart_c.markdown("**Metrics📈**")
|
||||
self.chart_c = chart_c.empty()
|
||||
hypothesis_status_c = col1.container(border=True, height=300)
|
||||
hypothesis_status_c.markdown('**Hypotheses🏅**')
|
||||
hypothesis_status_c.markdown("**Hypotheses🏅**")
|
||||
self.summary_c = hypothesis_status_c.empty()
|
||||
|
||||
self.RDL_win = RoundTabsWindow(container.container(),
|
||||
new_tab_func=lambda x: x.tag.endswith('hypothesis generation'),
|
||||
inner_class=SingleRDLoopWindow,
|
||||
title='R&D Loops♾️')
|
||||
|
||||
self.RDL_win = RoundTabsWindow(
|
||||
container.container(),
|
||||
new_tab_func=lambda x: x.tag.endswith("hypothesis generation"),
|
||||
inner_class=SingleRDLoopWindow,
|
||||
title="R&D Loops♾️",
|
||||
)
|
||||
|
||||
self.hypothesis_decisions = defaultdict(bool)
|
||||
self.current_hypothesis = None
|
||||
|
||||
self.results = []
|
||||
|
||||
def consume_msg(self, msg: Message):
|
||||
if not self.show_llm and 'llm_messages' in msg.tag:
|
||||
if not self.show_llm and "llm_messages" in msg.tag:
|
||||
return
|
||||
if not self.show_common_logs and isinstance(msg.content, str):
|
||||
return
|
||||
if isinstance(msg.content, dict):
|
||||
return
|
||||
if msg.tag.endswith('hypothesis generation'):
|
||||
if msg.tag.endswith("hypothesis generation"):
|
||||
self.current_hypothesis = msg.content.hypothesis
|
||||
elif msg.tag.endswith('ef.feedback'):
|
||||
elif msg.tag.endswith("ef.feedback"):
|
||||
self.hypothesis_decisions[self.current_hypothesis] = msg.content.decision
|
||||
self.summary_c.markdown('\n'.join(f"{id+1}. :green[{h}]\n" if d else f"{id+1}. {h}\n" for id,(h,d) in enumerate(self.hypothesis_decisions.items())))
|
||||
elif msg.tag.endswith('ef.model runner result') or msg.tag.endswith('ef.factor runner result'):
|
||||
self.summary_c.markdown(
|
||||
"\n".join(
|
||||
f"{id+1}. :green[{h}]\n" if d else f"{id+1}. {h}\n"
|
||||
for id, (h, d) in enumerate(self.hypothesis_decisions.items())
|
||||
)
|
||||
)
|
||||
elif msg.tag.endswith("ef.model runner result") or msg.tag.endswith("ef.factor runner result"):
|
||||
self.results.append(msg.content.result)
|
||||
if len(self.results) == 1:
|
||||
self.chart_c.table(self.results[0])
|
||||
else:
|
||||
df = pd.DataFrame(self.results, index=range(1, len(self.results)+1))
|
||||
df = pd.DataFrame(self.results, index=range(1, len(self.results) + 1))
|
||||
fig = px.line(df, x=df.index, y=df.columns, markers=True)
|
||||
self.chart_c.plotly_chart(fig)
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import inspect
|
||||
import re
|
||||
|
||||
from typing import Union, Dict, TypedDict, Optional
|
||||
from typing import Dict, Optional, TypedDict, Union
|
||||
|
||||
|
||||
class LogColors:
|
||||
|
||||
Reference in New Issue
Block a user