Merge pull request #5 from gperdrizet/dev
Browse files- assets/html.py +20 -0
- client/gradio_functions.py +36 -0
- rss_client.py +23 -12
assets/html.py
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
'''Collection of HTML elements for Gradio interface.'''
|
2 |
+
|
3 |
+
TITLE = (
|
4 |
+
'''
|
5 |
+
<center>
|
6 |
+
<h1>Agentic RSS reader</h1>
|
7 |
+
</center>
|
8 |
+
'''
|
9 |
+
)
|
10 |
+
|
11 |
+
DESCRIPTION = (
|
12 |
+
'''
|
13 |
+
<p>Uses sister Space
|
14 |
+
<a href='https://huggingface.co/spaces/Agents-MCP-Hackathon/rss-mcp-server'>
|
15 |
+
RSS feed reader</a> via MCP. Click 'Connect to MCP server' to get started.
|
16 |
+
Check out the <a href='https://github.com/gperdrizet/MCP-hackathon/tree/main'>
|
17 |
+
main project repo on GitHub</a>. Both Spaces by
|
18 |
+
<a href=https://www.linkedin.com/in/gperdrizet/'>George Perdrizet</a>.</p>
|
19 |
+
'''
|
20 |
+
)
|
client/gradio_functions.py
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
'''Collections of helper functions for Gradio user interface.'''
|
2 |
+
|
3 |
+
import os
|
4 |
+
import re
|
5 |
+
|
6 |
+
def update_log(n: int = 10):
|
7 |
+
'''Gets updated logging output from disk to display to user.
|
8 |
+
|
9 |
+
Args:
|
10 |
+
n: number of most recent lines of logging output to display
|
11 |
+
|
12 |
+
Returns:
|
13 |
+
Logging output as string
|
14 |
+
'''
|
15 |
+
|
16 |
+
with open('logs/rss_client.log', 'r', encoding='utf-8') as log_file:
|
17 |
+
lines = log_file.readlines()
|
18 |
+
|
19 |
+
return ''.join(lines[-n:])
|
20 |
+
|
21 |
+
|
22 |
+
def delete_old_logs(directory:str, basename:str) -> None:
|
23 |
+
'''Deletes old log files from previous optimization sessions, if present.
|
24 |
+
|
25 |
+
Args:
|
26 |
+
directory: path to log file directory as string
|
27 |
+
basename: log file base name as string
|
28 |
+
|
29 |
+
Returns:
|
30 |
+
None
|
31 |
+
'''
|
32 |
+
|
33 |
+
for filename in os.listdir(directory):
|
34 |
+
file_path = os.path.join(directory, filename)
|
35 |
+
if re.search(basename, filename):
|
36 |
+
os.remove(file_path)
|
rss_client.py
CHANGED
@@ -6,6 +6,8 @@ from pathlib import Path
|
|
6 |
from logging.handlers import RotatingFileHandler
|
7 |
|
8 |
import gradio as gr
|
|
|
|
|
9 |
import client.interface as interface
|
10 |
from client.mcp_client import MCPClientWrapper
|
11 |
from client.anthropic_bridge import AnthropicBridge
|
@@ -13,6 +15,9 @@ from client.anthropic_bridge import AnthropicBridge
|
|
13 |
# Make sure log directory exists
|
14 |
Path('logs').mkdir(parents=True, exist_ok=True)
|
15 |
|
|
|
|
|
|
|
16 |
# Set-up logger
|
17 |
logger = logging.getLogger()
|
18 |
|
@@ -62,21 +67,29 @@ async def send_message(message: str, chat_history: list) -> str:
|
|
62 |
|
63 |
|
64 |
with gr.Blocks(title='MCP RSS client') as demo:
|
65 |
-
gr.
|
66 |
-
|
67 |
-
|
68 |
-
|
69 |
-
via MCP. Click 'Connect to MCP server' to get started. Check out the
|
70 |
-
[main project repo on GitHub](https://github.com/gperdrizet/MCP-hackathon/tree/main).
|
71 |
-
Both Spaces by [George Perdrizet](https://www.linkedin.com/in/gperdrizet/).
|
72 |
-
""")
|
73 |
|
|
|
74 |
connect_btn = gr.Button('Connect to MCP server')
|
75 |
status = gr.Textbox(label='MCP server tool dump', interactive=False, lines=4)
|
|
|
|
|
|
|
|
|
|
|
76 |
|
|
|
|
|
|
|
|
|
|
|
|
|
77 |
chatbot = gr.Chatbot(
|
78 |
value=[],
|
79 |
-
height=
|
80 |
type='messages',
|
81 |
show_copy_button=True
|
82 |
)
|
@@ -88,8 +101,6 @@ with gr.Blocks(title='MCP RSS client') as demo:
|
|
88 |
scale=4
|
89 |
)
|
90 |
|
91 |
-
connect_btn.click(RSS_CLIENT.list_tools, outputs=status) # pylint: disable=no-member
|
92 |
-
|
93 |
msg.submit( # pylint: disable=no-member
|
94 |
send_message,
|
95 |
[msg, chatbot],
|
@@ -101,7 +112,7 @@ if __name__ == '__main__':
|
|
101 |
current_directory = os.getcwd()
|
102 |
|
103 |
if 'pyrite' in current_directory:
|
104 |
-
demo.launch(server_name=
|
105 |
|
106 |
else:
|
107 |
demo.launch()
|
|
|
6 |
from logging.handlers import RotatingFileHandler
|
7 |
|
8 |
import gradio as gr
|
9 |
+
import assets.html as html
|
10 |
+
import client.gradio_functions as gradio_funcs
|
11 |
import client.interface as interface
|
12 |
from client.mcp_client import MCPClientWrapper
|
13 |
from client.anthropic_bridge import AnthropicBridge
|
|
|
15 |
# Make sure log directory exists
|
16 |
Path('logs').mkdir(parents=True, exist_ok=True)
|
17 |
|
18 |
+
# Clear old logs if present
|
19 |
+
gradio_funcs.delete_old_logs('logs', 'rss_client')
|
20 |
+
|
21 |
# Set-up logger
|
22 |
logger = logging.getLogger()
|
23 |
|
|
|
67 |
|
68 |
|
69 |
with gr.Blocks(title='MCP RSS client') as demo:
|
70 |
+
with gr.Row():
|
71 |
+
gr.HTML(html.TITLE)
|
72 |
+
|
73 |
+
gr.Markdown(html.DESCRIPTION)
|
|
|
|
|
|
|
|
|
74 |
|
75 |
+
# MCP connection/tool dump
|
76 |
connect_btn = gr.Button('Connect to MCP server')
|
77 |
status = gr.Textbox(label='MCP server tool dump', interactive=False, lines=4)
|
78 |
+
connect_btn.click(RSS_CLIENT.list_tools, outputs=status) # pylint: disable=no-member
|
79 |
+
|
80 |
+
# Log output
|
81 |
+
logs = gr.Textbox(label='Client logs', lines=10, max_lines=10)
|
82 |
+
timer = gr.Timer(1, active=True)
|
83 |
|
84 |
+
timer.tick( # pylint: disable=no-member
|
85 |
+
lambda: gradio_funcs.update_log(), # pylint: disable=unnecessary-lambda
|
86 |
+
outputs=logs
|
87 |
+
)
|
88 |
+
|
89 |
+
# Chat interface
|
90 |
chatbot = gr.Chatbot(
|
91 |
value=[],
|
92 |
+
height=500,
|
93 |
type='messages',
|
94 |
show_copy_button=True
|
95 |
)
|
|
|
101 |
scale=4
|
102 |
)
|
103 |
|
|
|
|
|
104 |
msg.submit( # pylint: disable=no-member
|
105 |
send_message,
|
106 |
[msg, chatbot],
|
|
|
112 |
current_directory = os.getcwd()
|
113 |
|
114 |
if 'pyrite' in current_directory:
|
115 |
+
demo.launch(server_name='0.0.0.0', server_port=7860)
|
116 |
|
117 |
else:
|
118 |
demo.launch()
|