(EAI-140): Rename directories to match package names (#257)

* rename + move packages

* update CI/CD + build scripts

* update release confs

* update package names in docs

* fix version mismatch

* update lock file

Author: mongodben

.drone.yml

@@ -8,13 +8,13 @@ trigger:
     - tag
   paths:
     include:
-      - chat-server/**/*
-      - chat-core/**/*
-      - chat-ui/**/*
-      - ingest/**/*
-      - scripts/**/*
-      - ingest-mongodb-public/**/*
-      - chatbot-server-mongodb-public/**/*
+      - packages/mongodb-chatbot-server/**/*
+      - packages/mongodb-rag-core/**/*
+      - packages/mongodb-chatbot-ui/**/*
+      - packages/mongodb-rag-ingest/**/*
+      - packages/scripts/**/*
+      - packages/ingest-mongodb-public/**/*
+      - packages/chatbot-server-mongodb-public/**/*
       - package-lock.json
 
 steps:
@@ -71,10 +71,10 @@ trigger:
 
   paths:
     include:
-      - chat-server/**/*
-      - chatbot-server-mongodb-public/**/*
-      - chat-core/**/*
-      - chat-ui/**/*
+      - packages/mongodb-chatbot-server/**/*
+      - packages/chatbot-server-mongodb-public/**/*
+      - packages/mongodb-rag-core/**/*
+      - packages/mongodb-chatbot-ui/**/*
 
 steps:
   # Builds and publishes Docker image for staging
@@ -124,10 +124,10 @@ trigger:
     - staging
   paths:
     include:
-      - chat-server/**/*
-      - chatbot-server-mongodb-public/**/*
-      - chat-core/**/*
-      - chat-ui/**/*
+      - packages/mongodb-chatbot-server/**/*
+      - packages/chatbot-server-mongodb-public/**/*
+      - packages/mongodb-rag-core/**/*
+      - packages/mongodb-chatbot-ui/**/*
   branch:
     - main
 
@@ -142,7 +142,8 @@ steps:
       namespace: docs
       release: chat-server-staging
       values: image.tag=git-${DRONE_COMMIT_SHA:0:7}-staging,image.repository=795250896452.dkr.ecr.us-east-1.amazonaws.com/docs/${DRONE_REPO_NAME}-chat-server,ingress.enabled=true,ingress.hosts[0]=chat-server.docs.staging.corp.mongodb.com
-      values_files: ["chatbot-server-mongodb-public/environments/staging.yml"]
+      values_files:
+        ["packages/chatbot-server-mongodb-public/environments/staging.yml"]
       api_server: https://api.staging.corp.mongodb.com
       kubernetes_token:
         from_secret: staging_kubernetes_token
@@ -220,7 +221,7 @@ steps:
       namespace: docs
       release: chat-server-qa
       values: image.tag=git-${DRONE_COMMIT_SHA:0:7}-qa,image.repository=795250896452.dkr.ecr.us-east-1.amazonaws.com/docs/${DRONE_REPO_NAME}-chat-server,ingress.enabled=true,ingress.hosts[0]=chat-qa.docs.staging.corp.mongodb.com
-      values_files: ["chat-server/environments/qa.yml"]
+      values_files: ["packages/mongodb-chatbot-server/environments/qa.yml"]
       api_server: https://api.staging.corp.mongodb.com
       kubernetes_token:
         from_secret: staging_kubernetes_token
@@ -299,7 +300,7 @@ steps:
       release: docs-chat
       values: image.tag=git-${DRONE_COMMIT_SHA:0:7}-production,image.repository=795250896452.dkr.ecr.us-east-1.amazonaws.com/docs/${DRONE_REPO_NAME}-chat-server,ingress.enabled=true,ingress.hosts[0]=chat-server.docs.prod.corp.mongodb.com
       values_files:
-        ["chatbot-server-mongodb-public/environments/production.yml"]
+        ["packages/chatbot-server-mongodb-public/environments/production.yml"]
       api_server: https://api.prod.corp.mongodb.com
       kubernetes_token:
         from_secret: prod_kubernetes_token
@@ -320,9 +321,9 @@ trigger:
     - push
   paths:
     include:
-      - ingest/**/*
-      - ingest-mongodb-public/**/*
-      - chat-core/**/*
+      - packages/mongodb-rag-ingest/**/*
+      - packages/ingest-mongodb-public/**/*
+      - packages/mongodb-rag-core/**/*
 
 steps:
   # Builds and publishes Docker image for staging
@@ -371,9 +372,9 @@ trigger:
     - staging
   paths:
     include:
-      - ingest/**/*
-      - ingest-mongodb-public/**/*
-      - chat-core/**/*
+      - packages/mongodb-rag-ingest/**/*
+      - packages/ingest-mongodb-public/**/*
+      - packages/mongodb-rag-core/**/*
   branch:
     - main
 
@@ -389,7 +390,7 @@ steps:
       release: ingest-service
       values: image.tag=git-${DRONE_COMMIT_SHA:0:7}-staging,image.repository=795250896452.dkr.ecr.us-east-1.amazonaws.com/docs/${DRONE_REPO_NAME}-ingest-service
       values_files:
-        - ingest-mongodb-public/environments/staging.yml
+        - packages/ingest-mongodb-public/environments/staging.yml
       api_server: https://api.staging.corp.mongodb.com
       kubernetes_token:
         from_secret: staging_kubernetes_token
@@ -467,7 +468,7 @@ steps:
       release: ingest-service
       values: image.tag=git-${DRONE_COMMIT_SHA:0:7}-production,image.repository=795250896452.dkr.ecr.us-east-1.amazonaws.com/docs/${DRONE_REPO_NAME}-ingest-service
       values_files:
-        - ingest-mongodb-public/environments/production.yml
+        - packages/ingest-mongodb-public/environments/production.yml
       api_server: https://api.prod.corp.mongodb.com
       kubernetes_token:
         from_secret: prod_kubernetes_token
@@ -495,7 +496,7 @@ steps:
       - npm install lerna
       - npm run bootstrap -- --scope mongodb-rag-core
       - npm run build -- --scope mongodb-rag-core
-      - cd chat-core && npm publish
+      - cd mongodb-rag-core && npm publish
     environment:
       LG_ARTIFACTORY_TOKEN:
         from_secret: lg_artifactory_token
@@ -527,7 +528,7 @@ steps:
       - npm install lerna
       - npm run bootstrap -- --scope='{mongodb-rag-core,mongodb-rag-ingest}'
       - npm run build -- --scope='{mongodb-rag-core,mongodb-rag-ingest}'
-      - cd ingest && npm publish
+      - cd packages/mongodb-rag-ingest && npm publish
     environment:
       LG_ARTIFACTORY_TOKEN:
         from_secret: lg_artifactory_token
@@ -558,7 +559,7 @@ steps:
       - npm install lerna
       - npm run bootstrap -- --scope='{mongodb-rag-core,mongodb-chatbot-server}'
       - npm run build -- --scope='{mongodb-rag-core,mongodb-chatbot-server}'
-      - cd chat-server && npm publish
+      - cd packages/mongodb-chatbot-server && npm publish
     environment:
       LG_ARTIFACTORY_TOKEN:
         from_secret: lg_artifactory_token
@@ -589,7 +590,7 @@ steps:
       - npm install lerna
       - npm run bootstrap -- --scope='{mongodb-rag-core,mongodb-chatbot-ui}'
       - npm run build -- --scope='{mongodb-rag-core,mongodb-chatbot-ui}'
-      - cd chat-ui && npm publish
+      - cd packages/mongodb-chatbot-ui && npm publish
     environment:
       LG_ARTIFACTORY_TOKEN:
         from_secret: lg_artifactory_token
@@ -613,9 +614,9 @@ trigger:
     - push
   paths:
     include:
-      - scripts/**/*
-      - chat-core/**/*
-      - chat-server/**/*
+      - packages/scripts/**/*
+      - packages/mongodb-rag-core/**/*
+      - packages/mongodb-chatbot-server/**/*
 
 steps:
   # Builds and publishes Docker image for staging
@@ -664,9 +665,9 @@ trigger:
     - staging
   paths:
     include:
-      - scripts/**/*
-      - chat-core/**/*
-      - chat-server/**/*
+      - packages/scripts/**/*
+      - packages/mongodb-rag-core/**/*
+      - packages/mongodb-chatbot-server/**/*
   branch:
     - main
 
@@ -682,7 +683,7 @@ steps:
       release: scripts-service
       values: image.tag=git-${DRONE_COMMIT_SHA:0:7}-staging,image.repository=795250896452.dkr.ecr.us-east-1.amazonaws.com/docs/${DRONE_REPO_NAME}-scripts-service
       values_files:
-        - scripts/environments/staging.yml
+        - packages/scripts/environments/staging.yml
       api_server: https://api.staging.corp.mongodb.com
       kubernetes_token:
         from_secret: staging_kubernetes_token
@@ -760,7 +761,7 @@ steps:
       release: scripts-service
       values: image.tag=git-${DRONE_COMMIT_SHA:0:7}-production,image.repository=795250896452.dkr.ecr.us-east-1.amazonaws.com/docs/${DRONE_REPO_NAME}-scripts-service
       values_files:
-        - scripts/environments/production.yml
+        - packages/scripts/environments/production.yml
       api_server: https://api.prod.corp.mongodb.com
       kubernetes_token:
         from_secret: prod_kubernetes_token

CONTRIBUTING.md

@@ -18,13 +18,13 @@ We use [Lerna](https://lerna.js.org/) to manage our monorepo.
 
 The monorepo has the following main projects, each of which correspond to a JavaScript module:
 
-- `chat-server`: Express.js server that performs chat functionality. RESTful API.
-- `ingest`: CLI application that takes data from data sources and converts it to `embedded_content`
+- `mongodb-chatbot-server`: Express.js server that performs chat functionality. RESTful API.
+- `mongodb-rag-ingest`: CLI application that takes data from data sources and converts it to `embedded_content`
   used by Atlas Vector Search.
-- `chat-ui`: React component for interfacing with the `chat-server`.
+- `chat-ui`: React component for interfacing with the `mongodb-chatbot-server`.
   Built with Leafygreen and vite.
-- `chat-core`: Common resources shared across other projects.
-  - You need to recompile `chat-core` by running `npm run build`
+- `mongodb-rag-core`: Common resources shared across other projects.
+  - You need to recompile `mongodb-rag-core` by running `npm run build`
     every time you update it for the changes to be accessible in the other projects
     that dependend on it.
 - `mongodb-atlas`: Collection of scripts related to managing the MongoDB Atlas deployment used by the project.
@@ -60,8 +60,8 @@ Before you begin setting up the project, ask a current project contributor for t
 
 1. Artifactory credentials
 2. `.env` file variables for whichever projects you're working on.
-   At a minimum, you'll need the `chat-core` environment variables, as the other
-   projects depend on `chat-core`. If you're unsure which projects you need
+   At a minimum, you'll need the `mongodb-rag-core` environment variables, as the other
+   projects depend on `mongodb-rag-core`. If you're unsure which projects you need
    to work with, ask a current contributor.
 
 ### 2. Add Artifactory credentials
@@ -101,7 +101,7 @@ you need. You need to add the `.env` file to every project that you're working o
 
 Refer to the each project's `README` files for information about running that project.
 
-You can also run a development build of both the `chat-server` and `chat-ui`
+You can also run a development build of both the `mongodb-chatbot-server` and `chat-ui`
 with hot reload by running the following command from the root of the monorepo:
 
 ```sh
@@ -128,7 +128,7 @@ All packages' versioning is managed independently, which means that each package
 
 We use [semantic versioning](https://semver.org/) to version packages.
 
-Updating the version of a package is done as part of the release flow. Run the following command from a given package (e.g. `chat-server`):
+Updating the version of a package is done as part of the release flow. Run the following command from a given package (e.g. `mongodb-chatbot-server`):
 
 ```sh
 npm run release
@@ -143,7 +143,7 @@ that publishes the package to npm.
 
 ### Staging
 
-We run a staging version of the `chat-server` and `ingest` that uses
+We run a staging version of the `mongodb-chatbot-server` and `mongodb-rag-ingest` that uses
 the latest commit on the `main` branch. When you merge new commits into `main`,
 a CI/CD pipeline automatically builds and publishes the updated staging server and demo site.
 
@@ -186,7 +186,7 @@ builds and deploys the branch to the QA server.
 ### Production Deployments
 
 We use a tool called `release-it` to prepare production releases for the
-`chat-server`, `ingest`, and `chat-ui` projects.
+`mongodb-chatbot-server`, `mongodb-rag-ingest`, and `chat-ui` projects.
 
 Production releases are triggered by creating a git tag prefaced with the
 package name (e.g. `chat-server-v{version-number}`).
@@ -199,7 +199,7 @@ To create a new production release:
    git pull upstream main
    ```
 
-2. In the relevant package directory (e.g `chat-server`) run the release
+2. In the relevant package directory (e.g `mongodb-chatbot-server`) run the release
    command. This gets the package ready for a new release.
 
    ```sh

chat-ui/.env.development

@@ -3,15 +3,5 @@
   "useNx": true,
   "useWorkspaces": true,
   "version": "independent",
-  "packages": [
-    "chat-core",
-    "chat-server",
-    "chat-ui",
-    "ingest",
-    "chatbot-server-mongodb-public",
-    "ingest-mongodb-public",
-    "mongodb-atlas",
-    "performance-tests",
-    "scripts"
-  ]
+  "packages": ["packages/*"]
 }