Skip to content

Commit

Permalink
Merge branch 'main' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
daryllimyt committed Dec 28, 2024
2 parents eca20d6 + 4948349 commit 25da500
Show file tree
Hide file tree
Showing 85 changed files with 2,989 additions and 1,487 deletions.
18 changes: 0 additions & 18 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -96,24 +96,6 @@ NEXT_PUBLIC_POSTHOG_KEY=
NEXT_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
NEXT_PUBLIC_DISABLE_SESSION_RECORDING=true

# --- SMTP settings ---
# Settings used by the core.send_email_smtp action
SMTP_HOST=smtp.example.com
SMTP_PORT=465
SMTP_STARTTLS_ENABLED=1
SMTP_SSL_ENABLED=0
SMTP_IGNORE_CERT_ERRORS=0
SMTP_AUTH_ENABLED=1
SMTP_USER=testuser
SMTP_PASS=test

# --- LDAP settings ---
# Settings used by the integrations.ldap actions
LDAP_HOST=ldap.example.com
LDAP_PORT=389
LDAP_SSL=0
LDAP_TYPE=AD

# --- Remote registry ---
# If you wish to use a remote registry, set the URL here
# This is useful if you wish to use a custom set of UDFs
Expand Down
63 changes: 63 additions & 0 deletions .github/workflows/test-pnpm-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Test pnpm build

on:
push:
branches:
- main
paths:
- "frontend/**"
- ".github/workflows/test-pnpm-build.yml"
pull_request:
branches:
- main
paths:
- "frontend/**"
- ".github/workflows/test-pnpm-build.yml"

jobs:
push-ui-to-ghcr-test:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/tracecathq/tracecat-ui
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern=v{{version}}
type=semver,pattern=v{{major}}.{{minor}}
- name: Build and push Docker image
uses: docker/build-push-action@v6
env:
NEXT_PUBLIC_API_URL: http://localhost:8000
NEXT_PUBLIC_APP_ENV: production
NEXT_PUBLIC_APP_URL: http://localhost:3000
NEXT_SERVER_API_URL: http://localhost:8000
NODE_ENV: production
with:
context: frontend
file: frontend/Dockerfile.prod
build-args: |
NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }}
NEXT_PUBLIC_APP_ENV=${{ env.NEXT_PUBLIC_APP_ENV }}
NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
NEXT_SERVER_API_URL=${{ env.NEXT_SERVER_API_URL }}
NODE_ENV=${{ env.NODE_ENV }}
push: false
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
40 changes: 40 additions & 0 deletions alembic/versions/8be6393b2ee0_add_workflow_alias.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
"""Add workflow alias
Revision ID: 8be6393b2ee0
Revises: 3bc0a0970817
Create Date: 2024-12-24 18:10:17.717675
"""
from collections.abc import Sequence

import sqlalchemy as sa
import sqlmodel.sql.sqltypes

from alembic import op

# revision identifiers, used by Alembic.
revision: str = "8be6393b2ee0"
down_revision: str | None = "3bc0a0970817"
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.add_column(
"workflow",
sa.Column("alias", sqlmodel.sql.sqltypes.AutoString(), nullable=True),
)
op.create_index(op.f("ix_workflow_alias"), "workflow", ["alias"], unique=False)
op.create_unique_constraint(
"uq_workflow_alias_owner_id", "workflow", ["alias", "owner_id"]
)
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_constraint("uq_workflow_alias_owner_id", "workflow", type_="unique")
op.drop_index(op.f("ix_workflow_alias"), table_name="workflow")
op.drop_column("workflow", "alias")
# ### end Alembic commands ###
10 changes: 10 additions & 0 deletions docker-compose.ollama.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:
ollama:
image: ollama/ollama:${OLLAMA__VERSION}
ports:
- 11434:11434
volumes:
- ollama:/root/.ollama

volumes:
ollama:
12 changes: 0 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,21 +172,9 @@ services:
depends_on:
- temporal_postgres_db

ollama:
container_name: ollama
tty: true
restart: unless-stopped
networks:
- core
image: ollama/ollama:${OLLAMA__VERSION}
ports:
- 11434:11434
volumes:
- ollama:/root/.ollama
volumes:
core-db:
temporal-db:
ollama:

networks:
core:
Expand Down
3 changes: 3 additions & 0 deletions docs/api-reference/reference/editor/list-actions.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /editor/actions
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/editor/list-functions.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /editor/functions
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /organization/members/{user_id}
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/organization/delete-session.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /organization/sessions/{session_id}
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /organization/members
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/organization/list-sessions.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /organization/sessions
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: patch /organization/members/{user_id}
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /registry/repos/{repository_id}/sync-executor
---
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /registry/repos/{repository_id}/sync
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/tags/create-tag.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /tags
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/tags/delete-tag.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /tags/{tag_id}
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/tags/get-tag.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /tags/{tag_id}
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/tags/list-tags.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /tags
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/tags/update-tag.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: patch /tags/{tag_id}
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/workflows/add-tag.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: post /workflows/{workflow_id}/tags
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/workflows/list-tags.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: get /workflows/{workflow_id}/tags
---
3 changes: 3 additions & 0 deletions docs/api-reference/reference/workflows/remove-tag.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
openapi: delete /workflows/{workflow_id}/tags/{tag_id}
---
Loading

0 comments on commit 25da500

Please sign in to comment.