diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml index e28b5530cd..c51dafc9ad 100644 --- a/.github/workflows/server-test.yml +++ b/.github/workflows/server-test.yml @@ -49,7 +49,7 @@ jobs: run: cargo --locked fmt -p bleep -- --check - name: Clippy - run: cargo --locked clippy -p bleep --features=ee-pro,ee-cloud + run: cargo --locked clippy -p bleep - name: Tests - run: cargo --locked test -p bleep --release --features=ee-pro,ee-cloud \ No newline at end of file + run: cargo --locked test -p bleep --release \ No newline at end of file diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml deleted file mode 100644 index 5d638dd882..0000000000 --- a/.github/workflows/validate.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Validate helm chart resources - -on: - pull_request: - types: [opened] - branches: [main] - paths: - - "helm/**" - - ".github/workflows/validate.yml" - -jobs: - validate: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - uses: azure/setup-helm@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Install kubeval - run: | - wget https://github.com/instrumenta/kubeval/releases/latest/download/kubeval-linux-amd64.tar.gz - tar xf kubeval-linux-amd64.tar.gz - sudo cp kubeval /usr/local/bin - - - name: Run helm lint - run: | - helm lint helm/bloop - - - name: Run kubeval - run: | - helm template helm/bloop > spec.yaml - kubeval --schema-location https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master spec.yaml diff --git a/Cargo.lock b/Cargo.lock index 47282592f4..edac0d8adb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,7 +872,7 @@ dependencies = [ [[package]] name = "comrak" version = "0.18.0" -source = "git+https://github.com/rsdy/comrak#65eda8e5aa4044bad4fe63c93d8f985b2c7db25d" +source = "git+https://github.com/BloopAI/comrak#c805863a0cdc1cde1ae7ebd06cb871ca5712e285" dependencies = [ "derive_builder", "entities", @@ -7556,7 +7556,7 @@ dependencies = [ [[package]] name = "tree-sitter-COBOL" version = "0.0.1" -source = "git+https://github.com/nerdypepper/tree-sitter-cobol#8ba6692cc3c2bded0693d198936c6e26e6501230" +source = "git+https://github.com/BloopAI/tree-sitter-cobol#8ba6692cc3c2bded0693d198936c6e26e6501230" dependencies = [ "cc", "tree-sitter", diff --git a/Dockerfile b/Dockerfile index cded8b5236..581470282b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY server server COPY apps/desktop/src-tauri apps/desktop/src-tauri COPY Cargo.lock Cargo.toml . RUN --mount=target=/root/.cache/sccache,type=cache --mount=target=/build/target,type=cache \ - cargo --locked build --bin bleep --release --features=ee-cloud && \ + cargo --locked build --bin bleep --release && \ cp /build/target/release/bleep / && \ sccache --show-stats && \ mkdir /dylib && \ diff --git a/README.md b/README.md index a50819651c..f0da3240b4 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ https://github.com/BloopAI/bloop/assets/7957964/01db3ccb-4af0-49a0-92d6-5a9c4235 ## Features -- GPT-4 based conversational search +- AI-based conversational search - Code Studio, an LLM playground that uses your code as context - Blazing fast regex search -- Sync your local and GitHub repositories (support for more code hosts coming soon!) +- Sync your local and GitHub repositories - Sophisticated query filters so you can narrow down your results - Find functions, variables or traits with symbol search - Precise code navigation (go-to-reference and go-to-definition) for 10+ of the most popular languages built with [Tree-sitter](https://tree-sitter.github.io/tree-sitter/) @@ -39,10 +39,21 @@ For instructions on how to build from source or run bloop from the command line, - [Build bloop app from source](./apps/desktop/README.md) - [Run bloop from the command line](./server/README.md) -Note that it is currently _not_ possible to use conversational GPT-4 search where bloop has been built from source (we're working on this). You can run regex searches and use code-navigation. - If you encounter any index issues you can wipe the bloop cache and reindex. Instructions on how to do this on different platforms [are here](./apps/desktop/README.md). +## Building From Source + +You can build bloop from source and run it with your own OpenAI API key. Clone the repo, make sure the `oss` branch is checked out, and create a file called `local_config.json` at the top-level of the repo. `local_config.json` should contain the following fields: + +```json +{ + "github_access_token": "", + "openai_api_key": "" +} +``` + +Then follow [these installation instructions](./apps/desktop/README.md). If built from source, bloop will not collect any telemetry. + ## Contributing [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/BloopAI/bloop) diff --git a/helm/bloop/.helmignore b/helm/bloop/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/helm/bloop/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/helm/bloop/Chart.yaml b/helm/bloop/Chart.yaml deleted file mode 100644 index f5caa86a5c..0000000000 --- a/helm/bloop/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: bloop -description: A Helm chart for bloop Kubernetes application -type: application -version: 0.1.0 -appVersion: "0.1.0" diff --git a/helm/bloop/templates/_helpers.tpl b/helm/bloop/templates/_helpers.tpl deleted file mode 100644 index 232224c5d0..0000000000 --- a/helm/bloop/templates/_helpers.tpl +++ /dev/null @@ -1,102 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "bloop.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{- define "qdrant.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}-qdrant -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "bloop.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{- define "qdrant.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}-qdrant -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }}-qdrant -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}-qdrant -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "bloop.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "bloop.labels" -}} -helm.sh/chart: {{ include "bloop.chart" . }} -{{ include "bloop.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{- define "qdrant.labels" -}} -helm.sh/chart: {{ include "bloop.chart" . }} -{{ include "qdrant.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "bloop.selectorLabels" -}} -app.kubernetes.io/name: {{ include "bloop.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{- define "qdrant.selectorLabels" -}} -app.kubernetes.io/name: {{ include "qdrant.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }}-qdrant -{{- end }} - - -{{/* -Create the name of the service account to use -*/}} -{{- define "bloop.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "bloop.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} - -{{- define "qdrant.serviceAccountName" -}} -{{- if .Values.qdrant.serviceAccount.create }} -{{- default (include "qdrant.fullname" .) .Values.qdrant.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.qdrant.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/helm/bloop/templates/deployment.yaml b/helm/bloop/templates/deployment.yaml deleted file mode 100644 index d3dc9497f7..0000000000 --- a/helm/bloop/templates/deployment.yaml +++ /dev/null @@ -1,125 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "bloop.fullname" . }} - annotations: - secret.reloader.stakater.com/reload: "{{ include "bloop.fullname" . }}" - labels: - {{- include "bloop.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - revisionHistoryLimit: 1 - strategy: - type: Recreate - selector: - matchLabels: - {{- include "bloop.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "bloop.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.securityContext | nindent 8 }} - initContainers: - - name: prepare-folders - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 12 }} - image: "alpine:3.14" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: - - /bin/sh - args: - - -c - - "mkdir /data/repos -p" - volumeMounts: - - name: {{ include "bloop.fullname" . }}-storage - mountPath: /data - containers: - - name: {{ .Chart.Name }}-app - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - command: - - /bleep - args: - - --host=0.0.0.0 - - --source-dir=/data/repos - - --index-dir=/data/index - - --model-dir=/model - - --dylib-dir=/dylib - - --frontend-dist=/frontend - - --collection-name={{ .Values.qdrant.collectionName }} - - --max-threads={{ .Values.bloop.maxThreads }} - - --answer-api-url={{ .Values.bloop.answerApiUrl }} - - --qdrant-url={{ .Values.qdrant.url }} - - --embedding-server-url={{ .Values.bloop.embeddingServerUrl }}:8080 - - --embedding-batch-size={{ .Values.bloop.embeddingBatchSize }} - - --instance-domain={{ .Values.bloop.instanceDomain }} - - --cognito-userpool-id={{ .Values.bloop.cognitoUserpoolId }} - - --cognito-client-id={{ .Values.bloop.cognitoClientId }} - - --cognito-mgmt-url={{ .Values.bloop.cognitoMgmtUrl }} - - --cognito-auth-url={{ .Values.bloop.cognitoAuthUrl }} - - --bloop-instance-secret={{ .Values.bloop.bloopInstanceSecret }} - - --bloop-instance-org={{ .Values.bloop.githubOrgName }} - - --analytics-key={{ .Values.bloop.analyticsKey }} - - --analytics-data-plane={{ .Values.bloop.analyticsDataPlane }} - - --sentry-dsn={{ .Values.bloop.sentryDsn }} - - --sentry-dsn-fe={{ .Values.bloop.sentryDsnFE }} - - --analytics-key-fe={{ .Values.bloop.analyticsKeyFE }} - - --disable-log-write - env: - - name: BLOOP_LOG - value: {{ .Values.bloop.logLevel }} - {{ if .Values.env }} - {{ range .Values.env }} - - - {{- . | toYaml | nindent 12 -}} - {{ end }} - {{ end }} - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - resources: - {{- toYaml .Values.resources | nindent 12 }} - livenessProbe: - httpGet: - path: /api/health - port: 7878 - initialDelaySeconds: 20 - periodSeconds: 5 - volumeMounts: - - name: {{ include "bloop.fullname" . }}-storage - mountPath: /data - - mountPath: "/app/secrets" - name: {{ include "bloop.fullname" . }} - readOnly: true - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - volumes: - - name: {{ include "bloop.fullname" . }} - secret: - secretName: {{ include "bloop.fullname" . }} - - name: {{ include "bloop.fullname" . }}-storage - persistentVolumeClaim: - claimName: {{ include "bloop.fullname" . }}-storage diff --git a/helm/bloop/templates/ingress.yaml b/helm/bloop/templates/ingress.yaml deleted file mode 100644 index 44ce4ce10d..0000000000 --- a/helm/bloop/templates/ingress.yaml +++ /dev/null @@ -1,58 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "bloop.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "bloop.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - {{ if .secretName }} - secretName: {{ .secretName }} - {{ end }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: / - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- end }} - {{- end }} -{{- end }} diff --git a/helm/bloop/templates/notification-configmap.yaml b/helm/bloop/templates/notification-configmap.yaml deleted file mode 100644 index f488f62144..0000000000 --- a/helm/bloop/templates/notification-configmap.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "bloop.fullname" . }}-notification-script -data: - notification-script.sh: | - printf 'Waiting for environment to become ready' - until $(curl --output /dev/null --silent --head --fail http://{{ include "bloop.fullname" . }}:{{ .Values.service.port }}/repos); do - printf '.' - sleep 5 - done - - echo "Sending notification email to {{ .Values.bloop.githubOrgOwnerEmail }}" - curl -X POST https://app.loops.so/api/v1/events/send \ - -H "Content-Type: application/json; charset=utf-8" \ - -H "Authorization: Bearer {{ .Values.bloop.loopsAPIKey }}" \ - --data '{"email": "{{ .Values.bloop.githubOrgOwnerEmail }}", "firstName": "{{ .Values.bloop.githubOrgOwnerFirstName }}", "lastName": "{{ .Values.bloop.githubOrgOwnerLastName }}", "eventName": "{{ .Values.bloop.loopsEventName }}", "instanceUrl": "{{ .Values.bloop.githubOrgName }}.bloop.ai"}' - echo - echo "Done" diff --git a/helm/bloop/templates/notification-job.yaml b/helm/bloop/templates/notification-job.yaml deleted file mode 100644 index e3019a6f22..0000000000 --- a/helm/bloop/templates/notification-job.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ include "bloop.fullname" . }} - labels: - {{- include "bloop.labels" . | nindent 4 }} -spec: - template: - spec: - containers: - - name: send-email - image: alpine/curl:3.14 - command: - - /bin/sh - args: - - /bloop/notification-script.sh - volumeMounts: - - name: notification-script - mountPath: /bloop/ - restartPolicy: Never - volumes: - - name: notification-script - configMap: - name: {{ include "bloop.fullname" . }}-notification-script - backoffLimit: 4 diff --git a/helm/bloop/templates/pvc.yaml b/helm/bloop/templates/pvc.yaml deleted file mode 100644 index ff2276cc2f..0000000000 --- a/helm/bloop/templates/pvc.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ include "bloop.fullname" . }}-storage - labels: - app: {{ template "bloop.name" . }} -spec: - storageClassName: {{ .Values.persistence.storageClassName }} - accessModes: - {{- range .Values.persistence.accessModes }} - - {{ . | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} \ No newline at end of file diff --git a/helm/bloop/templates/secret.yaml b/helm/bloop/templates/secret.yaml deleted file mode 100644 index 2744c2958b..0000000000 --- a/helm/bloop/templates/secret.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "bloop.fullname" . }} - labels: - {{- include "bloop.labels" . | nindent 4 }} -type: Opaque \ No newline at end of file diff --git a/helm/bloop/templates/service.yaml b/helm/bloop/templates/service.yaml deleted file mode 100644 index 77fe1d79fc..0000000000 --- a/helm/bloop/templates/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: -{{- if .Values.service.annotations }} - annotations: -{{ tpl (toYaml .Values.service.annotations) . | indent 4 }} -{{- end }} - name: {{ include "bloop.fullname" . }} - labels: - {{- include "bloop.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - name: http - port: {{ .Values.service.port }} - targetPort: 7878 - selector: - {{- include "bloop.selectorLabels" . | nindent 4 }} diff --git a/helm/bloop/templates/serviceaccount.yaml b/helm/bloop/templates/serviceaccount.yaml deleted file mode 100644 index 2b3d26b951..0000000000 --- a/helm/bloop/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "bloop.serviceAccountName" . }} - labels: - {{- include "bloop.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/helm/bloop/values.yaml b/helm/bloop/values.yaml deleted file mode 100644 index ca6a80de1d..0000000000 --- a/helm/bloop/values.yaml +++ /dev/null @@ -1,99 +0,0 @@ -replicaCount: 1 - -bloop: - githubOrgName: "" - githubOrgOwnerEmail: "" - githubOrgOwnerFirstName: "" - githubOrgOwnerLastName: "" - loopsAPIKey: "" - loopsEventName: "" - cognitoUserpoolId: "" - cognitoClientId: "" - cognitoMgmtUrl: "" - cognitoAuthUrl: "" - instanceDomain: "" - answerApiUrl: "" - embeddingServerUrl: "" - embeddingBatchSize: "" - analyticsKey: "" - analyticsKeyFE: "" - analyticsDataPlane: "" - sentryDsn: "" - sentryDsnFE: "" - # - logLevel: info - maxThreads: 2 - -image: - repository: "" - pullPolicy: Always - tag: "" - -imagePullSecrets: - - name: eu-west-1-ecr-registry -nameOverride: "" -fullnameOverride: "" - -podAnnotations: {} - -securityContext: {} - # fsGroup: 65534 - -podSecurityContext: - runAsUser: 0 - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -service: - type: ClusterIP - port: 7879 - annotations: {} - -ingress: - enabled: true - className: nginx - annotations: - kubernetes.io/tls-acme: "true" - nginx.ingress.kubernetes.io/cors-allow-methods: HEAD - nginx.ingress.kubernetes.io/cors-allow-origin: https://bloop.ai, https://staging.bloop.ai - nginx.ingress.kubernetes.io/enable-cors: "true" - hosts: [] - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -env: {} - -resources: - requests: - cpu: 100m - memory: 100Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -persistence: - accessModes: ["ReadWriteOnce"] - size: 10Gi - storageClassName: gp3 - -qdrant: - url: "" - collectionName: "" \ No newline at end of file diff --git a/qdrant/config.yaml b/qdrant/config.yaml deleted file mode 100644 index 54397b0e50..0000000000 --- a/qdrant/config.yaml +++ /dev/null @@ -1,13 +0,0 @@ -debug: false -log_level: INFO -telemetry_disabled: true - -storage: - storage_path: qdrant/storage - snapshots_path: qdrant/storage - -service: - host: 0.0.0.0 - http_port: 6333 - # Uncomment to enable gRPC: - grpc_port: 6334 diff --git a/server/README.md b/server/README.md index 1d4df4a5df..ce5ffcbfef 100644 --- a/server/README.md +++ b/server/README.md @@ -1,6 +1,6 @@ # Server -A cargo workspace which contains `bleep`, the Rust package which powers bloop's search and code navigation. Note that it is currently _not_ possible to run conversational GPT-4 search from the command line (we're working on this). Calls to the `/api/answer` endpoint will return an error. +A cargo workspace which contains `bleep`, the Rust package which powers bloop's search and code navigation. ## Setup diff --git a/server/bleep/Cargo.toml b/server/bleep/Cargo.toml index 2b5f08f3f2..a18333b82d 100644 --- a/server/bleep/Cargo.toml +++ b/server/bleep/Cargo.toml @@ -72,7 +72,7 @@ tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev tree-sitter-ruby = "0.20.0" tree-sitter-r = "0.19.5" tree-sitter-php = { git = "https://github.com/tree-sitter/tree-sitter-php" } -tree-sitter-COBOL = { git = "https://github.com/nerdypepper/tree-sitter-cobol" } +tree-sitter-COBOL = { git = "https://github.com/BloopAI/tree-sitter-cobol" } petgraph = { version = "0.6.4", default-features = false, features = ["serde-1"] } # webserver @@ -108,7 +108,7 @@ itertools = "0.10.0" # latest crates.io version at the time of writing does not include necessary patches. # # 25.09.23: we now maintain a fork for stability -comrak = { default-features = false, git = "https://github.com/rsdy/comrak" } +comrak = { default-features = false, git = "https://github.com/BloopAI/comrak" } lazy-regex = "3.0.2" quick-xml = { version = "0.29.0", features = ["serialize"] } diff --git a/server/bleep/src/lib.rs b/server/bleep/src/lib.rs index b57f764a2f..b97b2d25e1 100644 --- a/server/bleep/src/lib.rs +++ b/server/bleep/src/lib.rs @@ -17,9 +17,6 @@ compile_error!("cannot enable `onnx` and `metal` at the same time"); #[cfg(feature = "color-eyre")] use color_eyre as _; -#[cfg(any(bench, test))] -use criterion as _; - use db::SqlDb; #[cfg(any(bench, test))] use git_version as _;