@brandon_9527/tcode 1.0.3 → 1.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/dist/python-src/entry.py +59 -17
  2. package/dist/python-src/main.py +71 -12
  3. package/dist/python-src/pyproject.toml +2 -1
  4. package/dist/python-src/skill_agent.py +144 -0
  5. package/dist/python-src/src/agents/token_tracker.py +44 -0
  6. package/dist/python-src/src/claw/__init__.py +0 -0
  7. package/dist/python-src/src/claw/bus/__init__.py +3 -0
  8. package/dist/python-src/src/claw/bus/events.py +10 -0
  9. package/dist/python-src/src/claw/bus/queue.py +43 -0
  10. package/dist/python-src/src/claw/channels/__init__.py +3 -0
  11. package/dist/python-src/src/claw/channels/base.py +30 -0
  12. package/dist/python-src/src/claw/channels/feishu.py +89 -0
  13. package/dist/python-src/src/claw/channels/manager.py +47 -0
  14. package/dist/python-src/src/claw/config/schema.py +46 -0
  15. package/dist/python-src/src/core/deepagents.py +1 -1
  16. package/dist/python-src/src/managers/manager_agent.py +15 -15
  17. package/dist/python-src/src/managers/manager_context.py +1 -1
  18. package/dist/python-src/src/managers/manager_instruction.py +16 -16
  19. package/dist/python-src/src/managers/manager_skill.py +121 -0
  20. package/dist/python-src/src/managers/sandbox.py +2 -2
  21. package/dist/python-src/src/middlewares/dynamic_content.py +15 -12
  22. package/dist/python-src/src/middlewares/hitl.py +3 -3
  23. package/dist/python-src/src/middlewares/inject_content.py +0 -0
  24. package/dist/python-src/src/middlewares/memory.py +2 -2
  25. package/dist/python-src/src/middlewares/skill.py +27 -0
  26. package/dist/python-src/src/middlewares/subagents.py +4 -4
  27. package/dist/python-src/src/middlewares/summary.py +33 -33
  28. package/dist/python-src/src/prompts/prompts.py +1 -1
  29. package/dist/python-src/src/stream/formatter.py +16 -16
  30. package/dist/python-src/src/stream/handler.py +44 -45
  31. package/dist/python-src/src/stream/handler_with_tracker.py +7 -7
  32. package/dist/python-src/src/tools/tools.py +2 -2
  33. package/dist/python-src/src/trackers/__init__.py +0 -0
  34. package/dist/python-src/src/trackers/token/__init__.py +0 -0
  35. package/dist/python-src/src/trackers/token/cli.py +45 -0
  36. package/dist/python-src/src/trackers/token/pricing.py +39 -0
  37. package/dist/python-src/src/trackers/token/report.py +114 -0
  38. package/dist/python-src/src/trackers/token/tracker.py +65 -0
  39. package/dist/python-src/src/tui/chatui.py +38 -41
  40. package/dist/python-src/src/tui/components/tlist.py +7 -7
  41. package/dist/python-src/src/tui/components/tscroll_panel.py +12 -12
  42. package/dist/python-src/src/tui/demo.py +22 -0
  43. package/dist/python-src/src/tui/utils/trender.py +22 -21
  44. package/dist/python-src/uv.lock +1974 -1939
  45. package/package.json +1 -1
@@ -44,61 +44,61 @@ class SummarizationMiddleware(AgentMiddleware):
44
44
  if isinstance(C,str):C=init_chat_model(C)
45
45
  A.model=C
46
46
  if B is _A:A.trigger=_A;G=[]
47
- elif isinstance(B,list):I=[A.cl(B,N)for B in B];A.trigger=I;G=I
48
- else:J=A.cl(B,N);A.trigger=J;G=[J]
49
- A._trigger_conditions=G;A.keep=A.cl(F,'keep')
47
+ elif isinstance(B,list):I=[A.cq(B,N)for B in B];A.trigger=I;G=I
48
+ else:J=A.cq(B,N);A.trigger=J;G=[J]
49
+ A._trigger_conditions=G;A.keep=A.cq(F,'keep')
50
50
  if H is count_tokens_approximately:A.token_counter=cm(A.model)
51
51
  else:A.token_counter=H
52
52
  A.summary_prompt=summary_prompt;A.trim_tokens_to_summarize=trim_tokens_to_summarize;K=any(A[0]==_D for A in A._trigger_conditions)
53
53
  if A.keep[0]==_D:K=_C
54
- if K and A.cn()is _A:O='Model profile information is required to use fractional token limits, and is unavailable for the specified model. Please use absolute token counts instead, or pass `\n\nChatModel(..., profile={"max_input_tokens": ...})`.\n\nwith a desired integer value of the model\'s maximum input tokens.';raise ValueError(O)
55
- def ck(B,state):A=state.get(_G,_F);return bool(A)
54
+ if K and A.cj()is _A:O='Model profile information is required to use fractional token limits, and is unavailable for the specified model. Please use absolute token counts instead, or pass `\n\nChatModel(..., profile={"max_input_tokens": ...})`.\n\nwith a desired integer value of the model\'s maximum input tokens.';raise ValueError(O)
55
+ def ct(B,state):A=state.get(_G,_F);return bool(A)
56
56
  @override
57
57
  def before_model(self,state,runtime):
58
- C=state;A=self;B=C[_B];A.cp(B);E=A.token_counter(B);F=A.ck(C);G=A.co(B,E)
58
+ C=state;A=self;B=C[_B];A.co(B);E=A.token_counter(B);F=A.ct(C);G=A.ch(B,E)
59
59
  if not G and not F:return
60
- D=A.cg(B)
60
+ D=A.cu(B)
61
61
  if D<=0:return
62
- H,I=A.cf(B,D);J=A.cj(H);K=A.ch(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
62
+ H,I=A.cn(B,D);J=A.ck(H);K=A.cl(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
63
63
  @override
64
64
  async def abefore_model(self,state,runtime):
65
- C=state;A=self;B=C[_B];A.cp(B);E=A.token_counter(B);F=A.ck(C);G=A.co(B,E)
65
+ C=state;A=self;B=C[_B];A.co(B);E=A.token_counter(B);F=A.ct(C);G=A.ch(B,E)
66
66
  if not G and not F:return
67
- D=A.cg(B)
67
+ D=A.cu(B)
68
68
  if D<=0:return
69
- H,I=A.cf(B,D);J=await A._acreate_summary(H);K=A.ch(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
70
- def cr(B,messages,threshold):
69
+ H,I=A.cn(B,D);J=await A._acreate_summary(H);K=A.cl(J);return{_B:[RemoveMessage(id=REMOVE_ALL_MESSAGES),*K,*I],_G:_F}
70
+ def ci(B,messages,threshold):
71
71
  A=next((A for A in reversed(messages)if isinstance(A,AIMessage)),_A)
72
72
  if isinstance(A,AIMessage)and A.usage_metadata is not _A and(C:=A.usage_metadata.get('total_tokens',-1))and C>=threshold and(D:=A.response_metadata.get('model_provider'))and D==B.model._get_ls_params().get('ls_provider'):return _C
73
73
  return _F
74
- def co(A,messages,total_tokens):
74
+ def ch(A,messages,total_tokens):
75
75
  F=total_tokens;E=messages
76
76
  if not A._trigger_conditions:return _F
77
77
  for(B,C)in A._trigger_conditions:
78
78
  if B==_B and len(E)>=C:return _C
79
79
  if B==_E and F>=C:return _C
80
- if B==_E and A.cr(E,C):return _C
80
+ if B==_E and A.ci(E,C):return _C
81
81
  if B==_D:
82
- G=A.cn()
82
+ G=A.cj()
83
83
  if G is _A:continue
84
84
  D=int(G*C)
85
85
  if D<=0:D=1
86
86
  if F>=D:return _C
87
- if A.cr(E,D):return _C
87
+ if A.ci(E,D):return _C
88
88
  return _F
89
- def cg(A,messages):
89
+ def cu(A,messages):
90
90
  B=messages;D,E=A.keep
91
91
  if D in{_E,_D}:
92
92
  C=A.cs(B)
93
93
  if C is not _A:return C
94
- return A.ci(B,_DEFAULT_MESSAGES_TO_KEEP)
95
- return A.ci(B,cast('int',E))
94
+ return A.cp(B,_DEFAULT_MESSAGES_TO_KEEP)
95
+ return A.cp(B,cast('int',E))
96
96
  def cs(C,messages):
97
97
  A=messages
98
98
  if not A:return 0
99
99
  H,I=C.keep
100
100
  if H==_D:
101
- J=C.cn()
101
+ J=C.cj()
102
102
  if J is _A:return
103
103
  F=int(J*I)
104
104
  elif H==_E:F=int(I)
@@ -114,8 +114,8 @@ class SummarizationMiddleware(AgentMiddleware):
114
114
  if B>=len(A):
115
115
  if len(A)==1:return 0
116
116
  B=len(A)-1
117
- return C.cq(A,B)
118
- def cn(C):
117
+ return C.cr(A,B)
118
+ def cj(C):
119
119
  try:A=C.model.profile
120
120
  except AttributeError:return
121
121
  if not isinstance(A,Mapping):return
@@ -123,7 +123,7 @@ class SummarizationMiddleware(AgentMiddleware):
123
123
  if not isinstance(B,int):return
124
124
  return B
125
125
  @staticmethod
126
- def cl(context,parameter_name):
126
+ def cq(context,parameter_name):
127
127
  E=context;C=parameter_name;D,B=E
128
128
  if D==_D:
129
129
  if not 0<B<=1:A=f"Fractional {C} values must be between 0 and 1, got {B}.";raise ValueError(A)
@@ -132,19 +132,19 @@ class SummarizationMiddleware(AgentMiddleware):
132
132
  else:A=f"Unsupported context size type {D} for {C}.";raise ValueError(A)
133
133
  return E
134
134
  @staticmethod
135
- def ch(summary):return[HumanMessage(content=f"Here is a summary of the conversation to date:\n\n{summary}",additional_kwargs={'lc_source':'summarization'})]
135
+ def cl(summary):return[HumanMessage(content=f"Here is a summary of the conversation to date:\n\n{summary}",additional_kwargs={'lc_source':'summarization'})]
136
136
  @staticmethod
137
- def cp(messages):
137
+ def co(messages):
138
138
  for A in messages:
139
139
  if A.id is _A:A.id=str(uuid.uuid4())
140
140
  @staticmethod
141
- def cf(conversation_messages,cutoff_index):B=cutoff_index;A=conversation_messages;C=A[:B];D=A[B:];return C,D
142
- def ci(C,messages,messages_to_keep):
141
+ def cn(conversation_messages,cutoff_index):B=cutoff_index;A=conversation_messages;C=A[:B];D=A[B:];return C,D
142
+ def cp(C,messages,messages_to_keep):
143
143
  B=messages_to_keep;A=messages
144
144
  if len(A)<=B:return 0
145
- D=len(A)-B;return C.cq(A,D)
145
+ D=len(A)-B;return C.cr(A,D)
146
146
  @staticmethod
147
- def cq(messages,cutoff_index):
147
+ def cr(messages,cutoff_index):
148
148
  B=cutoff_index;A=messages
149
149
  if B>=len(A)or not isinstance(A[B],ToolMessage):return B
150
150
  E=set();C=B
@@ -158,10 +158,10 @@ class SummarizationMiddleware(AgentMiddleware):
158
158
  H={A.get('id')for A in D.tool_calls if A.get('id')}
159
159
  if E&H:return G
160
160
  return C
161
- def cj(A,messages_to_sumarize):
161
+ def ck(A,messages_to_sumarize):
162
162
  B=messages_to_sumarize
163
163
  if not B:return _H
164
- C=A.ct(B)
164
+ C=A.cg(B)
165
165
  if not C:return'Previous conversation was too long to summarize'
166
166
  D=get_buffer_string(C)
167
167
  try:E=A.model.invoke(A.summary_prompt.format(messages=D));return E.text.strip()
@@ -169,12 +169,12 @@ class SummarizationMiddleware(AgentMiddleware):
169
169
  async def _acreate_summary(A,messages_to_summarize):
170
170
  B=messages_to_summarize
171
171
  if not B:return _H
172
- C=A.ct(B)
172
+ C=A.cg(B)
173
173
  if not C:return'Previous conversation was too long to summarize.'
174
174
  D=get_buffer_string(C)
175
175
  try:E=await A.model.ainvoke(A.summary_prompt.format(messages=D));return E.text.strip()
176
176
  except Exception as F:return f"Error generating sumamry: {F!s}"
177
- def ct(A,messages):
177
+ def cg(A,messages):
178
178
  B=messages
179
179
  try:
180
180
  if A.trim_tokens_to_summarize is _A:return B
@@ -1 +1 @@
1
- leader=' \n## 工作环境\n\nCURRENT_TIME: {CURRENT_TIME}\nWORKSPACE: {WORKSPACE}\n\n## 角色定位\n你的名字是 David。\n你是一位拥有15年以上经验的资深项目任务指挥师专家,擅长通过系统化分析项目需求和现状,将复杂的项目目标分解为清晰、可执行的任务分配方案。\n你具备敏锐的项目管理洞察力和团队协调能力,能够快速识别项目关键路径、资源需求和风险点,从而为团队成员制定详细的分步骤执行计划。\n你专注于任务分解、资源配置和团队协作,将宏观的项目目标转化为微观的可执行任务。\n\n\n注意: 严禁你代替成员完成任务,只能协调和分配任务,不能直接执行任务。\n\n## 工作空间说明\n 你的工作空间(WORKSPACE)位置为: {WORKSPACE}, 你的项目文件夹可以放在 {{WORKSPACE}} 下。\n\n## 核心能力 \n 1. **项目需求分析**:\n 深入理解项目目标、范围、约束条件和成功标准,识别关键需求和优先级。\n \n\n 2. **任务分解与规划**:\n 2.1 根据需求分析的结果判断项目的规模和复杂度。\n 2.2 如果是简单任务则按照其涉及到的工作内容直接分配给对应的团队成员执行。\n 2.3 如果不能明确判断任务和哪个团队成员相匹配,则优先分配给 通用代理 general agent 进行处理。\n 2.4 如果任务需要协调多个团队成员合作完成,则将项目目标分解为可管理的工作包,并明确任务间的依赖关系和执行顺序。\n 3. **团队角色分配**:根据任务特性和团队成员能力,合理分配团队成员的工作职责。\n 4. **协作流程设计**:设计高效的团队协作流程,明确沟通机制和决策流程。\n 5. **沟通协调**: \n 【注意】当团队成员在执行任务过程中需要与用户沟通,询问用户问题时,你需要接收成员的请求或询问, \n 终止当前的对话,将请求或询问内容放在 FINISH 的task中转发给用户。此时严禁自行回复成员或者分发任务。\n\n\n\n\n## 工作方式\n 你在指挥团队完成任务时需要严格遵循以下INSTRUCTION指令,不要执行超出指令范围之外的工作。\n 该指令约束了工作涉及范围以及定义了工作常规执行流程,并约束了工作涉及到的团队成员,\n 需要注意的是除了指令中指定的团队成员,不要调用其他的团队成员。\n\n\n## 约束条件\n - **沟通语言:** 必须使用**中文**与用户进行交流,以及回复用户问题和报告执行状态\n\n## 交互规则\n\n 【注意】在接收到用户回复时,你需要判断是否是处于团队成员与用户交互过程中:\n 1. 如果是,你直接将用户的回复转发给团队成员,无需额外处理和任务分解。\n 2. 如果不是,你需要根据用户的问题进行任务分解和分配。\n\n 【注意】如果团队成员回复内容为询问,提问的形式,你如果不能给出答案,则向用户询问。\n\n'
1
+ leader=' \n## 工作环境\n\nCURRENT_TIME: {CURRENT_TIME}\nWORKSPACE: {WORKSPACE}\n\n## 角色定位\n你的名字是 David。\n你是一位拥有15年以上经验的资深项目任务指挥师专家,擅长通过系统化分析项目需求和现状,将复杂的项目目标分解为清晰、可执行的任务分配方案。\n你具备敏锐的项目管理洞察力和团队协调能力,能够快速识别项目关键路径、资源需求和风险点,从而为团队成员制定详细的分步骤执行计划。\n你专注于任务分解、资源配置和团队协作,将宏观的项目目标转化为微观的可执行任务。\n\n\n注意: 严禁你代替成员完成任务,只能协调和分配任务,不能直接执行任务。\n\n## 工作空间说明\n 你的工作空间(WORKSPACE)位置为: {WORKSPACE}, 你的项目文件夹可以放在 {{WORKSPACE}} 下。\n\n## 核心能力 \n 1. **项目需求分析**:\n 深入理解项目目标、范围、约束条件和成功标准,识别关键需求和优先级。\n \n\n 2. **任务分解与规划**:\n 2.1 根据需求分析的结果判断项目的规模和复杂度。\n 2.2 如果是简单任务则按照其涉及到的工作内容直接分配给对应的团队成员执行。\n 2.3 如果不能明确判断任务和哪个团队成员相匹配,则优先分配给 通用代理 general-purpose 进行处理。\n 2.4 如果任务需要协调多个团队成员合作完成,则将项目目标分解为可管理的工作包,并明确任务间的依赖关系和执行顺序。\n 3. **团队角色分配**:根据任务特性和团队成员能力,合理分配团队成员的工作职责。\n 4. **协作流程设计**:设计高效的团队协作流程,明确沟通机制和决策流程。\n 5. **沟通协调**: \n 【注意】当团队成员在执行任务过程中需要与用户沟通,询问用户问题时,你需要接收成员的请求或询问, \n 终止当前的对话,将请求或询问内容放在 FINISH 的task中转发给用户。此时严禁自行回复成员或者分发任务。\n\n## 工作方式\n 你在指挥团队完成任务时需要严格遵循以下INSTRUCTION指令,不要执行超出指令范围之外的工作。\n 该指令约束了工作涉及范围以及定义了工作常规执行流程,并约束了工作涉及到的团队成员,\n 需要注意的是除了指令中指定的团队成员,不要调用其他的团队成员。\n\n\n## 约束条件\n - **沟通语言:** 必须使用**中文**与用户进行交流,以及回复用户问题和报告执行状态\n\n## 交互规则\n\n 【注意】在接收到用户回复时,你需要判断是否是处于团队成员与用户交互过程中:\n 1. 如果是,你直接将用户的回复转发给团队成员,无需额外处理和任务分解。\n 2. 如果不是,你需要根据用户的问题进行任务分解和分配。\n\n 【注意】如果团队成员回复内容为询问,提问的形式,你如果不能给出答案,则向用户询问。\n\n'
@@ -16,17 +16,17 @@ class ToolResultFormatter:
16
16
  def detect_type(B,content):
17
17
  A=content;A=A.strip()
18
18
  if A.statswith(SUCCESS_PREFIX):
19
- C=B.ba(A)
19
+ C=B.bh(A)
20
20
  if B.bi(C):return ContentType.JSON
21
21
  return ContentType.SUCCESS
22
22
  if A.startswith(FAILURE_PREFIX):return ContentType.ERROR
23
23
  if B.bi(A):return ContentType.JSON
24
- if B.bh(A):return ContentType.ERROR
25
- if B.bd(A):return ContentType.MARKDOWN
24
+ if B.bd(A):return ContentType.ERROR
25
+ if B.bg(A):return ContentType.MARKDOWN
26
26
  return ContentType.TEXT
27
27
  def is_success(A,content):return _is_success(content)
28
- def format(A,name,content,max_length=800):B=content;C=A.detect_type(B);D=A.is_success(B);E={ContentType.SUCCESS:A.bb,ContentType.ERROR:A.bj,ContentType.JSON:A.be,ContentType.MARKDOWN:A.bf,ContentType.TEXT:A.bc};F=E.get(C,A.bc);G=F(name,B,max_length);return FormattedResult(content_type=C,elements=G,success=D)
29
- def ba(B,content):A=content.split('\n',2);return A[2].strip()if len(A)>2 else''
28
+ def format(A,name,content,max_length=800):B=content;C=A.detect_type(B);D=A.is_success(B);E={ContentType.SUCCESS:A.be,ContentType.ERROR:A.bc,ContentType.JSON:A.ba,ContentType.MARKDOWN:A.bj,ContentType.TEXT:A.bb};F=E.get(C,A.bb);G=F(name,B,max_length);return FormattedResult(content_type=C,elements=G,success=D)
29
+ def bh(B,content):A=content.split('\n',2);return A[2].strip()if len(A)>2 else''
30
30
  def bi(B,content):
31
31
  A=content;A=A.strip()
32
32
  if not A:return _A
@@ -34,15 +34,15 @@ class ToolResultFormatter:
34
34
  try:json.loads(A);return True
35
35
  except(json.JSONDecodeError,ValueError):pass
36
36
  return _A
37
- def bh(B,content):A=['Traceback (most recent call last)','Exception:','Error:'];return any(A in content for A in A)
38
- def bd(C,content):A=content;B=['```','**','##','- **'];return A.startswith('#')or any(B in A for B in B)
39
- def bb(B,name,content,max_length):A='green';C=B.bg(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✓",border_style=A)]
40
- def bj(B,name,content,max_length):A='red';C=B.bg(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✗",border_style=A)]
41
- def be(B,name,content,max_length):
37
+ def bd(B,content):A=['Traceback (most recent call last)','Exception:','Error:'];return any(A in content for A in A)
38
+ def bg(C,content):A=content;B=['```','**','##','- **'];return A.startswith('#')or any(B in A for B in B)
39
+ def be(B,name,content,max_length):A='green';C=B.bf(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✓",border_style=A)]
40
+ def bc(B,name,content,max_length):A='red';C=B.bf(content,max_length);return[Panel(Text(C,style=A),title=f"📤 {name} ✗",border_style=A)]
41
+ def ba(B,name,content,max_length):
42
42
  D=max_length;A=content;E=A
43
- if A.startswith(SUCCESS_PREFIX):E=B.ba(A)
44
- try:F=json.loads(E);C=json.dumps(F,indent=2,ensure_ascii=_A);C=B.bg(C,D);return[Text(f"📤 {name} ✓",style=_B),Syntax(C,'json',theme='monokai',line_numbers=_A)]
45
- except(json.JSONDecodeError,ValueError):return B.bc(name,A,D)
46
- def bf(A,name,content,max_length):B=A.bg(content,max_length);return[Panel(Markdown(B),title=f"📤 {name}",border_style='cyan dim')]
47
- def bc(A,name,content,max_length):B=A.bg(content,max_length);return[Text(f"📤 {name}:",style=_B),Text(f" {B}",style='dim')]
48
- def bg(A,content,max_length):return truncate(content,max_length)
43
+ if A.startswith(SUCCESS_PREFIX):E=B.bh(A)
44
+ try:F=json.loads(E);C=json.dumps(F,indent=2,ensure_ascii=_A);C=B.bf(C,D);return[Text(f"📤 {name} ✓",style=_B),Syntax(C,'json',theme='monokai',line_numbers=_A)]
45
+ except(json.JSONDecodeError,ValueError):return B.bb(name,A,D)
46
+ def bj(A,name,content,max_length):B=A.bf(content,max_length);return[Panel(Markdown(B),title=f"📤 {name}",border_style='cyan dim')]
47
+ def bb(A,name,content,max_length):B=A.bf(content,max_length);return[Text(f"📤 {name}:",style=_B),Text(f" {B}",style='dim')]
48
+ def bf(A,content,max_length):return truncate(content,max_length)
@@ -12,13 +12,13 @@ _R='result'
12
12
  _Q='tool_id'
13
13
  _P='parent_id'
14
14
  _O='custom'
15
- _N=False
16
- _M='text'
17
- _L='value'
18
- _K='__interrupt__'
19
- _J='auto'
20
- _I='status'
21
- _H='updates'
15
+ _N='updates'
16
+ _M=False
17
+ _L='text'
18
+ _K='value'
19
+ _J='__interrupt__'
20
+ _I='auto'
21
+ _H='status'
22
22
  _G='type'
23
23
  _F='id'
24
24
  _E='content'
@@ -34,38 +34,37 @@ from src.stream.emitter import StreamEventEmitter as emitter
34
34
  from src.stream.tracker import ToolCallTracker
35
35
  from src.stream.file_write_parser import StreamParser
36
36
  async def ainput(prompt=''):return await asyncio.to_thread(input,prompt)
37
- async def anormal_handler(stream,detail=_N):
38
- E=detail
39
- async for H in stream:
40
- if not isinstance(H,tuple)or len(H)!=2:continue
41
- F,G=H
42
- if F!=_H:print(f"[STREAM_MODE]: {F} {G}")
43
- if F==_H:
37
+ async def anormal_handler(stream,detail=_M):
38
+ E=detail;M=''
39
+ async for F in stream:
40
+ if not isinstance(F,tuple)or len(F)!=2:continue
41
+ J,G=F
42
+ if J==_N:
44
43
  if not isinstance(G,dict):continue
45
- for(M,C)in G.items():
44
+ for(N,C)in G.items():
46
45
  if C is _C or isinstance(C,tuple):continue
47
46
  if _A in C and isinstance(C[_A],list)and len(C[_A])>0:
48
47
  for A in C[_A]:
49
48
  if isinstance(A,AIMessage)and len(A.tool_calls)>0:
50
49
  for B in A.tool_calls:
51
- D=B[_B];I=B[_D];K=B[_F]
52
- if E:print(f"[TOOL_CALL]: {D} \nargs: ({I}) ")
53
- if isinstance(A,AIMessage)and A.content and A.content!='':print(f"[AIMESSAGE]: {A.content}")
50
+ D=B[_B];H=B[_D];K=B[_F]
51
+ if E:print(f"[TOOL_CALL]: {D} \nargs: ({H}) ")
52
+ if isinstance(A,AIMessage)and A.content and A.content!='':print(f"bot> {A.content}");M+=A.content
54
53
  if isinstance(A,ToolMessage):
55
- D=A.name;J=A.content;K=A.tool_call_id
56
- if E:print(f"[TOOL_RESULT]: {D} \nresult: {J}")
57
- elif F==_O:
58
- B=json.loads(G);L=getattr(B,_G,'');N=getattr(B,_P,'');K=getattr(B,_Q,'');D=getattr(B,_B,'');I=getattr(B,_D,'');J=getattr(B,_R,'');O=getattr(B,_I,_S)
54
+ D=A.name;I=A.content;K=A.tool_call_id
55
+ if E:print(f"[TOOL_RESULT]: {D} \nresult: {I}")
56
+ elif J==_O:
57
+ B=json.loads(G);L=B.get(_G,'');O=B.get(_P,'');K=B.get(_Q,'');D=B.get(_B,'');H=B.get(_D,'');I=B.get(_R,'');P=B.get(_H,_S)
59
58
  if L==_T:
60
- if E:print(f"[SUB TOOL_CALL]: {D} \nargs: ({I}) ")
59
+ if E:print(f"[SUB TOOL_CALL]: {D} \nargs: ({H}) ")
61
60
  elif L==_U:
62
- if E:print(f"[SUB TOOL_RESULT]: {D} \nresult: {J}")
63
- async def astream_handler(stream,debug=_N,interrupt_tools=[],tool_mode=_J):
61
+ if E:print(f"[SUB TOOL_RESULT]: {D} \nresult: {I}")
62
+ async def astream_handler(stream,debug=_M,interrupt_tools=[],tool_mode=_I):
64
63
  P=interrupt_tools;J=debug;K=[];S='';T=StreamParser(top_fields=['path',_E])
65
64
  async for F in stream:
66
65
  if not isinstance(F,tuple)or len(F)!=2:continue
67
66
  L,D=F
68
- if L==_H:
67
+ if L==_N:
69
68
  if not isinstance(D,dict):continue
70
69
  for(d,H)in D.items():
71
70
  if H is _C or isinstance(H,tuple):continue
@@ -74,35 +73,35 @@ async def astream_handler(stream,debug=_N,interrupt_tools=[],tool_mode=_J):
74
73
  if isinstance(C,AIMessage)and len(C.tool_calls)>0:
75
74
  for B in C.tool_calls:
76
75
  E=B[_B];I=B[_D];G=B[_F]
77
- if len(P)>0 and tool_mode!=_J and E.strip().lower()in P:continue
76
+ if len(P)>0 and tool_mode!=_I and E.strip().lower()in P:continue
78
77
  A=emitter.tool_call(E,I,G);yield A.data
79
78
  if isinstance(C,ToolMessage):E=C.name;M=C.content;G=C.tool_call_id;A=emitter.tool_result(E,M,_W,G);yield A.data
80
79
  if isinstance(C,AIMessage)and C.usage_metadata:N=C.usage_metadata;U=N.get(_X,_C);V=N.get(_Y);W=N.get(_Z,_C);A=emitter.token_usage(U,V,W);yield A.data
81
- if _K in D:
82
- K=D[_K]
80
+ if _J in D:
81
+ K=D[_J]
83
82
  if K:
84
- e=_a;X=list(map(lambda interrupt:{_V:interrupt.id,_L:interrupt.value},K))
85
- for O in X:Y='hitl';Z=O[_V];a=O[_L];B=a['action_requests'][0];E=B[_B];G=B[_F];I=B[_D];A=emitter.tool_call(E,I,G);yield A.data;A=emitter.interrupt(interrupt_type=Y,interrupt_id=Z,value=O);yield A.data
83
+ e=_a;X=list(map(lambda interrupt:{_V:interrupt.id,_K:interrupt.value},K))
84
+ for O in X:Y='hitl';Z=O[_V];a=O[_K];B=a['action_requests'][0];E=B[_B];G=B[_F];I=B[_D];A=emitter.tool_call(E,I,G);yield A.data;A=emitter.interrupt(interrupt_type=Y,interrupt_id=Z,value=O);yield A.data
86
85
  elif L==_A:
87
86
  if isinstance(D,tuple)and len(D)>=2:F=D[0]
88
87
  else:F=D
89
88
  if J:b=type(F).__name__;print(f"[DEBUG] Event: {b}")
90
89
  if isinstance(F,(AIMessageChunk,AIMessage)):
91
90
  for A in bk(F,T):
92
- if A.type==_M:S+=A.data.get(_E,'')
91
+ if A.type==_L:S+=A.data.get(_E,'')
93
92
  if J:print(f"[DEBUG] Yielding: {A.type}")
94
93
  yield A.data
95
94
  elif L==_O:
96
- B=json.loads(D);Q=B.get(_G,'');R=B.get(_P,'');G=B.get(_Q,'');E=B.get(_B,'');I=B.get(_D,'');M=B.get(_R,'');c=B.get(_I,_S)
95
+ B=json.loads(D);Q=B.get(_G,'');R=B.get(_P,'');G=B.get(_Q,'');E=B.get(_B,'');I=B.get(_D,'');M=B.get(_R,'');c=B.get(_H,_S)
97
96
  if Q==_T:A=emitter.tool_call(E,I,G,R);yield A.data
98
97
  elif Q==_U:A=emitter.tool_result(E,M,c,G,R);yield A.data
99
98
  if J:print(_b)
100
- def stream_handler(stream,debug=_N,interrupts=[],tool_mode=_J):
99
+ def stream_handler(stream,debug=_M,interrupts=[],tool_mode=_I):
101
100
  R='role';J=debug;G=interrupts;G=[];S='';T=StreamParser(top_fields=['path',_E])
102
101
  for E in stream:
103
102
  if not isinstance(E,tuple)or len(E)!=2:continue
104
103
  K,C=E
105
- if K==_H:
104
+ if K==_N:
106
105
  if not isinstance(C,dict):continue
107
106
  for(Y,I)in C.items():
108
107
  if I is _C or isinstance(I,tuple):continue
@@ -111,26 +110,26 @@ def stream_handler(stream,debug=_N,interrupts=[],tool_mode=_J):
111
110
  if isinstance(D,AIMessage)and len(D.tool_calls)>0:
112
111
  for B in D.tool_calls:
113
112
  F=B[_B];L=B[_D];H=B[_F]
114
- if tool_mode!=_J and F.strip().lower()in G:continue
113
+ if tool_mode!=_I and F.strip().lower()in G:continue
115
114
  A=emitter.tool_call(F,L,H);yield A.data
116
115
  if isinstance(D,ToolMessage):F=D.name;M=D.content;H=D.tool_call_id;A=emitter.tool_result(F,M,True,H);yield A.data
117
116
  if isinstance(D,AIMessage)and D.response_metadata['finish_reason']=='stop':N=D.response_metadata.get('token_usage',{});Z=N.get(_X,0);a=N.get(_Y,0);b=N.get(_Z,0)
118
- if _K in C:
119
- G=C[_K]
117
+ if _J in C:
118
+ G=C[_J]
120
119
  if G:
121
- print('--'*30);print(f"[INTERRUPT EVENT]: {G}");c=_a;U=list(map(lambda interrupt:{_V:interrupt.id,_L:interrupt.value,R:'ask_human'},G))
122
- for O in U:d=O[R];V=O[_L][_G];emitter.interrupt(event_name='interrupt',event_type=V,event_data=O);break
120
+ print('--'*30);print(f"[INTERRUPT EVENT]: {G}");c=_a;U=list(map(lambda interrupt:{_V:interrupt.id,_K:interrupt.value,R:'ask_human'},G))
121
+ for O in U:d=O[R];V=O[_K][_G];emitter.interrupt(event_name='interrupt',event_type=V,event_data=O);break
123
122
  elif K==_A:
124
123
  if isinstance(C,tuple)and len(C)>=2:E=C[0]
125
124
  else:E=C
126
125
  if J:W=type(E).__name__;print(f"[DEBUG] Event: {W}")
127
126
  if isinstance(E,(AIMessageChunk,AIMessage)):
128
127
  for A in bk(E,T):
129
- if A.type==_M:S+=A.data.get(_E,'')
128
+ if A.type==_L:S+=A.data.get(_E,'')
130
129
  if J:print(f"[DEBUG] Yielding: {A.type}")
131
130
  yield A.data
132
131
  elif K==_O:
133
- print(f"[CUSTOM]: {C}");B=json.loads(C);P=getattr(B,_G,'');Q=getattr(B,_P,'');H=getattr(B,_Q,'');F=getattr(B,_B,'');L=getattr(B,_D,'');M=getattr(B,_R,'');X=getattr(B,_I,_S)
132
+ print(f"[CUSTOM]: {C}");B=json.loads(C);P=getattr(B,_G,'');Q=getattr(B,_P,'');H=getattr(B,_Q,'');F=getattr(B,_B,'');L=getattr(B,_D,'');M=getattr(B,_R,'');X=getattr(B,_H,_S)
134
133
  if P==_T:A=emitter.tool_call(F,L,H,Q);yield A.data
135
134
  elif P==_U:A=emitter.tool_result(F,M,X,H,Q);yield A.data
136
135
  if J:print(_b)
@@ -156,8 +155,8 @@ def bk(chunk,stream_parser):
156
155
  if G in(L,M):
157
156
  J=A.get(L)or A.get(M)or''
158
157
  if J:yield emitter.thinking(J)
159
- elif G==_M:
160
- K=A.get(_M)or A.get(_E)or''
158
+ elif G==_L:
159
+ K=A.get(_L)or A.get(_E)or''
161
160
  if K:yield emitter.text(K)
162
161
  elif G=='tool_call_chunk':
163
162
  O=A.get(_F,'');H=A.get(_B,'')
@@ -168,6 +167,6 @@ def bk(chunk,stream_parser):
168
167
  if H==I:F.feed(D)
169
168
  if H==I and D=='':F.reset()
170
169
  def bl(chunk):
171
- A=chunk;D=getattr(A,_B,'unknown');B=str(getattr(A,_E,''));E=getattr(A,'tool_call_id','');F=getattr(A,_I,_W);C=B[:DisplayLimits.TOOL_RESULT_MAX]
170
+ A=chunk;D=getattr(A,_B,'unknown');B=str(getattr(A,_E,''));E=getattr(A,'tool_call_id','');F=getattr(A,_H,_W);C=B[:DisplayLimits.TOOL_RESULT_MAX]
172
171
  if len(B)>DisplayLimits.TOOL_RESULT_MAX:C+='\n... (truncated)'
173
172
  yield emitter.tool_result(D,C,F,E)
@@ -64,12 +64,12 @@ async def astream_handler(stream,emitter,tracker,debug=False):
64
64
  if F:print(f"[DEBUG] Yielding: {C.type}")
65
65
  yield C.data
66
66
  if hasattr(A,_Y)and A.tool_calls:
67
- for C in bo(A.tool_calls,E,J):
67
+ for C in bq(A.tool_calls,E,J):
68
68
  if F:print(f"[DEBUG] Yielding from tool_calls: {C.type} took call: {A.tool_calls}")
69
69
  yield C.data
70
70
  elif hasattr(A,_B)and A.type=='tool':
71
71
  if F:I=getattr(A,_A,_L);print(f"[DEBUG] Processing tool result: {I}")
72
- for C in bp(A,E,J):
72
+ for C in bo(A,E,J):
73
73
  if F:print(f"[DEBUG] Yielding: {C.type}")
74
74
  yield C.data
75
75
  elif K==_Z:
@@ -104,12 +104,12 @@ def stream_handler(stream,emitter,tracker,debug=False):
104
104
  if F:print(f"[DEBUG] Yielding: {C.type}")
105
105
  yield C.data
106
106
  if hasattr(A,_Y)and A.tool_calls:
107
- for C in bo(A.tool_calls,E,J):
107
+ for C in bq(A.tool_calls,E,J):
108
108
  if F:print(f"[DEBUG] Yielding from tool_calls: {C.type}")
109
109
  yield C.data
110
110
  elif hasattr(A,_B)and A.type=='tool':
111
111
  if F:I=getattr(A,_A,_L);print(f"[DEBUG] Processing tool result: {I}")
112
- for C in bp(A,E,J):
112
+ for C in bo(A,E,J):
113
113
  if F:print(f"[DEBUG] Yielding: {C.type}")
114
114
  yield C.data
115
115
  elif K==_Z:
@@ -160,19 +160,19 @@ def bn(chunk,emitter,tracker,stream_parser):
160
160
  E.append_json_delta(H,A.get(U,0))
161
161
  if D==L:K.feed(H)
162
162
  if D==L and H=='':K.reset()
163
- def bq(block,emitter,tracker):
163
+ def bp(block,emitter,tracker):
164
164
  C=tracker;B=block;A=B.get(_K,'')
165
165
  if A:
166
166
  D=B.get(_A,'');E=B.get('input',{});F=E if isinstance(E,dict)else{};C.update(A,name=D,args=F)
167
167
  if C.is_ready(A):C.mark_emitted(A);yield emitter.tool_call(D,F,A)
168
- def bo(tool_calls,emitter,tracker):
168
+ def bq(tool_calls,emitter,tracker):
169
169
  B=tracker
170
170
  for C in tool_calls:
171
171
  A=C.get(_K,'')
172
172
  if A:
173
173
  D=C.get(_A,'');E=C.get(_F,{});F=E if isinstance(E,dict)else{};B.update(A,name=D,args_complete=True)
174
174
  if B.is_ready(A):B.mark_emitted(A);yield emitter.tool_call(D,F,A)
175
- def bp(chunk,emitter,tracker):
175
+ def bo(chunk,emitter,tracker):
176
176
  E=tracker;D=emitter;A=chunk;E.finalize_all()
177
177
  for B in E.get_all():yield D.tool_call(B.name,B.args,B.id)
178
178
  G=getattr(A,_A,_L);F=str(getattr(A,_C,''));I=getattr(A,'tool_call_id','');J=getattr(A,_M,'success');C=F[:DisplayLimits.TOOL_RESULT_MAX]
@@ -445,10 +445,10 @@ def grep(pattern: str, path: str, runtime: ToolRuntime = None) -> str:
445
445
  cwd = runtime.context.working_directory
446
446
 
447
447
  if runtime.context.sandbox:
448
- original_path, path = container2local(file_path, cwd)
448
+ original_path, path = container2local(path, cwd)
449
449
  search_path = resolve_path(path, cwd)
450
450
  else:
451
- search_path = resolve_path(file_path, cwd)
451
+ search_path = resolve_path(path, cwd)
452
452
 
453
453
 
454
454
  try:
File without changes
File without changes
@@ -0,0 +1,45 @@
1
+ from __future__ import annotations
2
+ _A=None
3
+ import argparse,json,sys
4
+ from datetime import datetime,timedelta,timezone
5
+ from pathlib import Path
6
+ from.pricing import ModelPricing
7
+ from.tracker import CostTracker,UsageRecord,BudgetGuard
8
+ from.report import CostReport
9
+ def parse_since(s):
10
+ A=datetime.now(timezone.utc);s=s.strip().lower()
11
+ if s.endswith('d'):return A-timedelta(days=int(s[:-1]))
12
+ if s.endswith('w'):return A-timedelta(weeks=int(s[:-1]))
13
+ if s.endswith('m'):return A-timedelta(days=30*int(s[:-1]))
14
+ if s.endswith('h'):return A-timedelta(hours=int(s[:-1]))
15
+ return datetime.fromisoformat(s)
16
+ def cmd_add(args,tracker):
17
+ B=tracker;A=args;D=B.add_call(model=A.model,input_tokens=A.input,output_tokens=A.output,tag=A.tag);E=ModelPricing()
18
+ try:F=E.comp(A.model,A.input,A.output);C=f"${F:.6f}"
19
+ except KeyError:C='unknown (model not in pricing DB)'
20
+ print(f"✓ Logged: {A.model} {A.input:,} in / {A.output:,} out cost={C} tag={A.tag}");print(f" record_id={D.record_id} db={B.db_path}")
21
+ def cmd_report(args,tracker):
22
+ A=args;B=parse_since(A.since)if A.since else _A;C=CostReport(tracker)
23
+ if A.format=='json':print(C.to_json(since=B,period=A.period))
24
+ else:print(C.to_text(since=B,period=A.period))
25
+ def cmd_models(args):
26
+ C=ModelPricing();B=C.list_models(provider=args.provider)
27
+ if not B:print('No models found.');return
28
+ print(f"\n{'Model':<45} {'Provider':<12} {'Input $/1M':>12} {'Output $/1M':>12}");print('─'*85)
29
+ for A in B:print(f" {A.model:<43} {A.provider:<12} ${A.input_per_1m:>10.3f} ${A.output_per_1m:>10.3f}")
30
+ print()
31
+ def cmd_budget(args,tracker):
32
+ C=tracker;A=args
33
+ if A.budget_cmd=='set':D=BudgetGuard(tag=A.tag,limit_usd=A.limit);C.set_budget(D);print(f"✓ Budget set: tag={A.tag} limit=${A.limit:.2f}");B=C.total_cost(tag=A.tag);E=B/A.limit*100 if A.limit>0 else 0;print(f" Current spend: ${B:.4f} ({E:.1f}% of budget)")
34
+ elif A.budget_cmd=='check':B=C.total_cost(tag=A.tag);print(f" Tag '{A.tag}': ${B:.4f} spent")
35
+ else:print('Usage: llm-cost budget set --tag TAG --limit AMOUNT')
36
+ def main():
37
+ P='budget';O='models';N='daily';M='text';L='report';K='add';H='--tag';B=True;C=argparse.ArgumentParser(prog='llm-cost',description='LLM cost tracker — log API calls, report spending, guard budgets.');C.add_argument('--db',type=Path,default=_A,help='Path to usage DB (default: ~/.config/llm-cost-tracker/usage.jsonl)');E=C.add_subparsers(dest='command');D=E.add_parser(K,help='Log an LLM API call');D.add_argument('--model',required=B,help='Model name, e.g. gpt-4o');D.add_argument('--input',type=int,required=B,help='Input token count');D.add_argument('--output',type=int,required=B,help='Output token count');D.add_argument(H,default='default',help='Project/tag label');D.add_argument('--timestamp',default=_A,help='ISO timestamp (default: now)');F=E.add_parser(L,help='Show cost report');F.add_argument('--since',default='30d',help='e.g. 7d, 1w, 1m, or ISO date');F.add_argument('--format',choices=[M,'json'],default=M);F.add_argument('--period',choices=[N,'weekly','monthly'],default=N);Q=E.add_parser(O,help='List pricing database');Q.add_argument('--provider',default=_A,help='Filter by provider');R=E.add_parser(P,help='Budget guard commands');I=R.add_subparsers(dest='budget_cmd');J=I.add_parser('set',help='Set a budget for a tag');J.add_argument(H,required=B);J.add_argument('--limit',type=float,required=B,help='Budget in USD');S=I.add_parser('check',help='Check spending for a tag');S.add_argument(H,required=B);A=C.parse_args()
38
+ if not A.command:C.print_help();sys.exit(0)
39
+ G=CostTracker(db_path=A.db)
40
+ if A.command==K:cmd_add(A,G)
41
+ elif A.command==L:cmd_report(A,G)
42
+ elif A.command==O:cmd_models(A)
43
+ elif A.command==P:cmd_budget(A,G)
44
+ else:C.print_help()
45
+ if __name__=='__main__':main()
@@ -0,0 +1,39 @@
1
+ _I='qwen'
2
+ _H='mistral'
3
+ _G='avg hosted price'
4
+ _F='meta'
5
+ _E='cohere'
6
+ _D=None
7
+ _C='google'
8
+ _B='anthropic'
9
+ _A='openai'
10
+ from dataclasses import dataclass
11
+ from typing import Optional
12
+ @dataclass(frozen=True)
13
+ class ModelRate:provider:str;model:str;input_per_1m:float;output_per_1m:float;notes:str=''
14
+ _PRICING={}
15
+ def cy(*C):
16
+ for A in C:
17
+ _PRICING[A.model]=A;B=A.model.split('/')[-1]if'/'in A.model else _D
18
+ if B and B not in _PRICING:_PRICING[B]=A
19
+ cy(ModelRate(_A,'gpt-4o',2.5,1e1),ModelRate(_A,'gpt-4o-mini',.15,.6),ModelRate(_A,'gpt-4o-2024-11-20',2.5,1e1),ModelRate(_A,'gpt-4-turbo',1e1,3e1),ModelRate(_A,'gpt-4',3e1,6e1),ModelRate(_A,'gpt-3.5-turbo',.5,1.5),ModelRate(_A,'o1',15.,6e1),ModelRate(_A,'o1-mini',3.,12.),ModelRate(_A,'o3-mini',1.1,4.4),ModelRate(_A,'o3',1e1,4e1),ModelRate(_B,'claude-3-5-sonnet-20241022',3.,15.),ModelRate(_B,'claude-3-5-haiku-20241022',.8,4.),ModelRate(_B,'claude-3-opus-20240229',15.,75.),ModelRate(_B,'claude-3-sonnet-20240229',3.,15.),ModelRate(_B,'claude-3-haiku-20240307',.25,1.25),ModelRate(_B,'claude-sonnet-4-5',3.,15.),ModelRate(_B,'claude-sonnet-4-6',3.,15.),ModelRate(_B,'claude-opus-4',15.,75.),ModelRate(_C,'gemini-1.5-pro',3.5,10.5,'up to 128k ctx'),ModelRate(_C,'gemini-1.5-flash',.075,.3),ModelRate(_C,'gemini-2.0-flash',.1,.4),ModelRate(_C,'gemini-2.0-flash-lite',.075,.3),ModelRate(_C,'gemini-2.0-pro',3.5,10.5),ModelRate(_E,'command-r-plus',2.5,1e1),ModelRate(_E,'command-r',.15,.6),ModelRate(_E,'command-r7b',.0375,.15),ModelRate(_F,'llama-3.3-70b-instruct',.23,.4,_G),ModelRate(_F,'llama-3.1-405b-instruct',3.,3.,_G),ModelRate(_F,'llama-3.1-70b-instruct',.2,.2,_G),ModelRate(_H,'mistral-large-2411',2.,6.),ModelRate(_H,'mistral-small-2501',.1,.3),ModelRate(_H,'codestral-2501',.1,.3),ModelRate(_I,'qwen-plus',2.,6.),ModelRate(_I,'qwen-max-3',2.,6.),ModelRate(_I,'qwen-max-3.5',2.,6.))
20
+ class ModelPricing:
21
+ def __init__(A,custom_rates=_D):
22
+ B=custom_rates;A._db=dict(_PRICING)
23
+ if B:A._db.update(B)
24
+ def get_rate(A,model):
25
+ C=model;B=C.lower().strip()
26
+ if B in A._db:return A._db[B]
27
+ for(D,E)in A._db.items():
28
+ if B in D or D in B:return E
29
+ raise KeyError(f"Unknown model: {C!r}. Known models: {sorted(A._db)}")
30
+ def compute_cost(B,model,input_tokens,output_tokens):A=B.get_rate(model);return A.input_per_1m*input_tokens/1000000+A.output_per_1m*output_tokens/1000000
31
+ def list_models(F,provider=_D):
32
+ B=provider;C=set();D=[]
33
+ for A in F._db.values():
34
+ E=A.provider,A.model
35
+ if E in C:continue
36
+ C.add(E)
37
+ if B is _D or A.provider.lower()==B.lower():D.append(A)
38
+ return sorted(D,key=lambda r:(r.provider,r.model))
39
+ def add_custom(A,rate):A._db[rate.model]=rate