Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix merge errors
Tomas Valenta1e605579d97d
diff --git a/pages/index.tsx b/pages/index.tsxindex 54309fd84..3df52ae0b 100644--- a/pages/index.tsx+++ b/pages/index.tsx@@ -122,6 +122,8 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {log_files: {select: {id: true,+ relativePath: true,+ filename: true,created_at: true,log_upload_id: true,},@@ -172,6 +174,8 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {log_files: {select: {id: true,+ relativePath: true,+ filename: true,created_at: true,log_upload_id: true,},@@ -201,6 +205,8 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {log_files: {select: {id: true,+ relativePath: true,+ filename: true,created_at: true,log_upload_id: true,},@@ -262,6 +268,8 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {log_files: {select: {id: true,+ relativePath: true,+ filename: true,created_at: true,log_upload_id: true,},diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex b76e35e89..108984f2b 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -283,6 +283,7 @@ model projects {name String @default("")development_logs Json[]is_default Boolean @default(false)+ slug String? @uniquedeployments deployments[]log_files log_files[]log_uploads log_uploads[]diff --git a/utils/agentLogs.ts b/utils/agentLogs.tsindex 3af0a8b7b..79adf3431 100644--- a/utils/agentLogs.ts+++ b/utils/agentLogs.ts@@ -6,7 +6,7 @@ export interface LiteDeploymentLog extends Omit<log_files, 'content'> {}export interface LiteDeployment extends deployments {- log_files: Pick<log_files, 'id' | 'created_at' | 'log_upload_id'>[]+ log_files: Pick<log_files, 'id' | 'created_at' | 'log_upload_id' | 'relativePath' | 'filename'>[]projects: {name: string}