Skip to content

Commit fb14ab8

Browse files
authored
feat: integrate xtramcp to backend (#15)
1 parent 93d45a9 commit fb14ab8

9 files changed

Lines changed: 94 additions & 9 deletions

File tree

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ jobs:
9595
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY_PRD }}
9696
MCP_BASIC_KEY: ${{ secrets.MCP_BASIC_KEY_PRD }}
9797
MCP_PAPERSCORE_KEY: ${{ secrets.MCP_PAPERSCORE_KEY_PRD }}
98+
XTRAGPT_OPENAI_API_KEY: ${{ secrets.XTRAGPT_OPENAI_API_KEY_PRD }}
99+
XTRAGPT_OPENREVIEW_BASE_URL: ${{ secrets.XTRAGPT_OPENREVIEW_BASE_URL_PRD }}
100+
XTRAGPT_OPENREVIEW_USERNAME: ${{ secrets.XTRAGPT_OPENREVIEW_USERNAME_PRD }}
101+
XTRAGPT_OPENREVIEW_PASSWORD: ${{ secrets.XTRAGPT_OPENREVIEW_PASSWORD_PRD }}
98102
MONGO_URI: ${{ secrets.MONGO_URI_PRD }}
99103
GHCR_DOCKER_CONFIG: ${{ secrets.GHCR_DOCKER_CONFIG_PRD }}
100104
CLOUDFLARE_TUNNEL_TOKEN: ${{ secrets.CLOUDFLARE_TUNNEL_TOKEN_PRD }}

hack/dev-apply.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ echo $ROOT_DIR
1010
OPENAI_API_KEY=${OPENAI_API_KEY:-sk-dummy-OPENAI_API_KEY}
1111
MCP_BASIC_KEY=${MCP_BASIC_KEY:-sk-dummy-MCP_BASIC_KEY}
1212
MCP_PAPERSCORE_KEY=${MCP_PAPERSCORE_KEY:-sk-dummy-MCP_PAPERSCORE_KEY}
13+
XTRAGPT_OPENAI_API_KEY=${XTRAGPT_OPENAI_API_KEY:-sk-dummy-XTRAGPT_OPENAI_API_KEY}
14+
XTRAGPT_OPENREVIEW_BASE_URL=${XTRAGPT_OPENREVIEW_BASE_URL:-https://api2.openreview.net}
15+
XTRAGPT_OPENREVIEW_USERNAME=${XTRAGPT_OPENREVIEW_USERNAME:-dummy-XTRAGPT_OPENREVIEW_USERNAME}
16+
XTRAGPT_OPENREVIEW_PASSWORD=${XTRAGPT_OPENREVIEW_PASSWORD:-dummy-XTRAGPT_OPENREVIEW_PASSWORD}
1317
GHCR_DOCKER_CONFIG=${GHCR_DOCKER_CONFIG:-dummy-ghcr-docker-config}
1418
CLOUDFLARE_TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN:-dummy-cloudflare-tunnel-token}
1519

@@ -20,6 +24,10 @@ helm template $ROOT_DIR/helm-chart \
2024
--set-string openai_api_key=$OPENAI_API_KEY \
2125
--set-string mcp_basic_key=$MCP_BASIC_KEY \
2226
--set-string mcp_paperscore_key=$MCP_PAPERSCORE_KEY \
27+
--set-string xtragpt_openai_api_key=$XTRAGPT_OPENAI_API_KEY \
28+
--set-string xtragpt_openreview_base_url=$XTRAGPT_OPENREVIEW_BASE_URL \
29+
--set-string xtragpt_openreview_username=$XTRAGPT_OPENREVIEW_USERNAME \
30+
--set-string xtragpt_openreview_password=$XTRAGPT_OPENREVIEW_PASSWORD \
2331
--set-string ghcr_docker_config=$GHCR_DOCKER_CONFIG \
2432
--set-string cloudflare_tunnel_token=$CLOUDFLARE_TUNNEL_TOKEN |
2533
kubectl apply -f -

hack/prd.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ cd $ROOT_DIR
88
OPENAI_API_KEY=${OPENAI_API_KEY:-sk-dummy-OPENAI_API_KEY}
99
MCP_BASIC_KEY=${MCP_BASIC_KEY:-sk-dummy-MCP_BASIC_KEY}
1010
MCP_PAPERSCORE_KEY=${MCP_PAPERSCORE_KEY:-sk-dummy-MCP_PAPERSCORE_KEY}
11+
XTRAGPT_OPENAI_API_KEY=${XTRAGPT_OPENAI_API_KEY:-sk-dummy-XTRAGPT_OPENAI_API_KEY}
12+
XTRAGPT_OPENREVIEW_BASE_URL=${XTRAGPT_OPENREVIEW_BASE_URL:-https://api2.openreview.net}
13+
XTRAGPT_OPENREVIEW_USERNAME=${XTRAGPT_OPENREVIEW_USERNAME:-dummy-XTRAGPT_OPENREVIEW_USERNAME}
14+
XTRAGPT_OPENREVIEW_PASSWORD=${XTRAGPT_OPENREVIEW_PASSWORD:-dummy-XTRAGPT_OPENREVIEW_PASSWORD}
1115
PAPERDEBUGGER_IMAGE=${PAPERDEBUGGER_IMAGE:-ghcr.io/paperdebugger/sharelatex-paperdebugger:latest}
1216
MONGO_URI=${MONGO_URI:-}
1317
GHCR_DOCKER_CONFIG=${GHCR_DOCKER_CONFIG:-dummy-ghcr-docker-config}
@@ -20,6 +24,10 @@ helm template $ROOT_DIR/helm-chart \
2024
--set-string openai_api_key=$OPENAI_API_KEY \
2125
--set-string mcp_basic_key=$MCP_BASIC_KEY \
2226
--set-string mcp_paperscore_key=$MCP_PAPERSCORE_KEY \
27+
--set-string xtragpt_openai_api_key=$XTRAGPT_OPENAI_API_KEY \
28+
--set-string xtragpt_openreview_base_url=$XTRAGPT_OPENREVIEW_BASE_URL \
29+
--set-string xtragpt_openreview_username=$XTRAGPT_OPENREVIEW_USERNAME \
30+
--set-string xtragpt_openreview_password=$XTRAGPT_OPENREVIEW_PASSWORD \
2331
--set-string paperdebugger.image=$PAPERDEBUGGER_IMAGE \
2432
--set-string mongo.uri=$MONGO_URI \
2533
--set-string ghcr_docker_config=$GHCR_DOCKER_CONFIG \

hack/stg.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ cd $ROOT_DIR
88
OPENAI_API_KEY=${OPENAI_API_KEY:-sk-dummy-OPENAI_API_KEY}
99
MCP_BASIC_KEY=${MCP_BASIC_KEY:-sk-dummy-MCP_BASIC_KEY}
1010
MCP_PAPERSCORE_KEY=${MCP_PAPERSCORE_KEY:-sk-dummy-MCP_PAPERSCORE_KEY}
11+
XTRAGPT_OPENAI_API_KEY=${XTRAGPT_OPENAI_API_KEY:-sk-dummy-XTRAGPT_OPENAI_API_KEY}
12+
XTRAGPT_OPENREVIEW_BASE_URL=${XTRAGPT_OPENREVIEW_BASE_URL:-https://api2.openreview.net}
13+
XTRAGPT_OPENREVIEW_USERNAME=${XTRAGPT_OPENREVIEW_USERNAME:-dummy-XTRAGPT_OPENREVIEW_USERNAME}
14+
XTRAGPT_OPENREVIEW_PASSWORD=${XTRAGPT_OPENREVIEW_PASSWORD:-dummy-XTRAGPT_OPENREVIEW_PASSWORD}
1115
PAPERDEBUGGER_IMAGE=${PAPERDEBUGGER_IMAGE:-ghcr.io/paperdebugger/sharelatex-paperdebugger:latest}
1216
MONGO_URI=${MONGO_URI:-}
1317
GHCR_DOCKER_CONFIG=${GHCR_DOCKER_CONFIG:-dummy-ghcr-docker-config}
@@ -20,6 +24,10 @@ helm template $ROOT_DIR/helm-chart \
2024
--set-string openai_api_key=$OPENAI_API_KEY \
2125
--set-string mcp_basic_key=$MCP_BASIC_KEY \
2226
--set-string mcp_paperscore_key=$MCP_PAPERSCORE_KEY \
27+
--set-string xtragpt_openai_api_key=$XTRAGPT_OPENAI_API_KEY \
28+
--set-string xtragpt_openreview_base_url=$XTRAGPT_OPENREVIEW_BASE_URL \
29+
--set-string xtragpt_openreview_username=$XTRAGPT_OPENREVIEW_USERNAME \
30+
--set-string xtragpt_openreview_password=$XTRAGPT_OPENREVIEW_PASSWORD \
2331
--set-string paperdebugger.image=$PAPERDEBUGGER_IMAGE \
2432
--set-string mongo.uri=$MONGO_URI \
2533
--set-string ghcr_docker_config=$GHCR_DOCKER_CONFIG \
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
name: paperdebugger-xtramcp-server
6+
namespace: {{ .Values.namespace }}
7+
spec:
8+
selector:
9+
matchLabels:
10+
app: paperdebugger-xtramcp-server
11+
template:
12+
metadata:
13+
labels:
14+
app: paperdebugger-xtramcp-server
15+
spec:
16+
imagePullSecrets:
17+
- name: ghcr-secret
18+
containers:
19+
- name: paperdebugger-xtramcp-server
20+
image: {{ .Values.paperdebuggerXtraMcpServer.image }}
21+
imagePullPolicy: IfNotPresent
22+
ports:
23+
- containerPort: 8080
24+
envFrom:
25+
- configMapRef:
26+
name: paperdebugger-xtramcp-server
27+
---
28+
apiVersion: v1
29+
kind: Service
30+
metadata:
31+
name: paperdebugger-xtramcp-server
32+
namespace: {{ .Values.namespace }}
33+
spec:
34+
selector:
35+
app: paperdebugger-xtramcp-server
36+
ports:
37+
- name: http
38+
port: 80
39+
targetPort: 8080
40+
- name: http-alt
41+
port: 8080
42+
targetPort: 8080
43+
type: ClusterIP
44+
---
45+
apiVersion: v1
46+
kind: ConfigMap
47+
metadata:
48+
name: paperdebugger-xtramcp-server
49+
namespace: {{ .Values.namespace }}
50+
data:
51+
OPENAI_API_KEY: "{{ .Values.xtragpt_openai_api_key }}"
52+
OPENREVIEW_BASE_URL: "{{ .Values.xtragpt_openreview_base_url }}"
53+
OPENREVIEW_USERNAME: "{{ .Values.xtragpt_openreview_username }}"
54+
OPENREVIEW_PASSWORD: "{{ .Values.xtragpt_openreview_password }}"

helm-chart/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ paperdebugger:
1010
paperdebuggerMcpServer:
1111
image: ghcr.io/paperdebugger/paperdebugger-mcp-server:main-14409c5
1212

13+
paperdebuggerXtraMcpServer:
14+
image: ghcr.io/paperdebugger/paperdebugger-xtramcp-server:main-14409c5
15+
1316
mongo:
1417
in_cluster: true
1518
uri: "" # if in_cluster is false, use the external mongo instead

internal/libs/cfg/cfg.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func xtraMCPURI() string {
3333
if val != "" {
3434
return val
3535
}
36-
return "http://paperdebugger-xtra-mcp-server.com/mcp"
36+
return "http://paperdebugger-xtramcp-server:8080/mcp"
3737
}
3838

3939
func mongoURI() string {

webapp/_webapp/src/components/markdown.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ const MarkdownComponent = memo(({ children, prevAttachment, animated }: Markdown
5252
</span>
5353
),
5454
},
55-
p: {
56-
component: ({ children, ...props }: ComponentProps) => (
57-
<div {...props} className="mb-2 original-p">
58-
<AnimatedText animated={animated}>{children}</AnimatedText>
59-
</div>
60-
),
61-
},
55+
// p: {
56+
// component: ({ children, ...props }: ComponentProps) => (
57+
// <div {...props} className="mb-2 original-p">
58+
// <AnimatedText animated={animated}>{children}</AnimatedText>
59+
// </div>
60+
// ),
61+
// },
6262
h1: {
6363
component: ({ children, ...props }: ComponentProps) => (
6464
<div {...props} className="text-lg font-bold mt-2">

webapp/_webapp/src/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ body {
9292
}
9393

9494
.tool-card.narrow {
95-
@apply px-2 py-0 my-1 bg-transparent;
95+
@apply px-2 py-1 my-1 bg-transparent;
9696
}
9797

9898
.tool-card.animated {

0 commit comments

Comments
 (0)