Skip to content

Commit

Permalink
Resolving merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
azaylamba committed Feb 9, 2024
1 parent b58737d commit cb8793d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cli/magic-create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const embeddingModels = [

function createConfig(config: any): void {
fs.writeFileSync("./bin/config.json", JSON.stringify(config, undefined, 2));
console.log("New config written to ./bin/config.json");
console.log("Configuration written to ./bin/config.json");
}

/**
Expand Down Expand Up @@ -437,7 +437,7 @@ async function processCreateOptions(options: any): Promise<void> {
{
type: "confirm",
name: "create",
message: "Do you want to create a new config based on the above",
message: "Do you want to create/update a new config based on the above settings",
initial: true,
},
])) as any
Expand Down
4 changes: 2 additions & 2 deletions cli/magic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { LIB_VERSION } from "./version.js";
let program = new Command();
program
.version(LIB_VERSION)
.command("create", "📦 creates a new configuration for the a Chatbot")
.command("config", "📦 manage the chatbot configuration")
.command("show", "🚚 display the current chatbot configuration")
.command("deploy", "🌟 deploys the chatbot to your account")
.description("🛠️ Easily create a chatbots");
.description("🛠️ Easily create a chatbot");

program.parse(process.argv);
})();
2 changes: 1 addition & 1 deletion docs/about/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ To have the right instance types and how to request them, read [Amazon SageMaker
> NOTE: Make sure to review [IDEFICS models license sections](https://huggingface.co/HuggingFaceM4/idefics-80b-instruct#license).
To deploy a multimodal model, follow the [deploy instructions](../guide/deploy)
and select one of the supported models (press Space to select/deselect) from the magic-create CLI step and deploy as instructed in the above section.
and select one of the supported models (press Space to select/deselect) from the magic-config CLI step and deploy as instructed in the above section.

> ⚠️ NOTE ⚠️ Amazon SageMaker are billed by the hour. Be aware of not letting this model run unused to avoid unnecessary costs.
Expand Down
6 changes: 3 additions & 3 deletions docs/guide/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ See the documentation for more details [on environment resize](https://docs.aws.
npm install && npm run build
```

4. Once done, run the magic-create CLI to help you set up the solution with the features you care most:
4. Once done, run the magic-config CLI to help you set up the solution with the features you care most:

```bash
npm run create
Expand All @@ -109,11 +109,11 @@ You'll be prompted to configure the different aspects of the solution, such as:
- Setup of the RAG system: engine selection (i.e. Aurora w/ pgvector, OpenSearch, Kendra..) embeddings selection and more to come.
- Private Chatbot: Limit accessibility to website and backend to VPC.

When done, answer `Y` to create a new configuration.
When done, answer `Y` to create or update your configuration.

![sample](./assets/magic-create-sample.gif "CLI sample")

Your configuration is now stored under `bin/config.json`. You can re-run the magic-create command as needed to update your `config.json`
Your configuration is now stored under `bin/config.json`. You can re-run the magic-config command as needed to update your `config.json`

5. (Optional) Bootstrap AWS CDK on the target account and region

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"watch": "tsc -w",
"cdk": "cdk",
"gen": "npx @aws-amplify/cli codegen",
"create": "node ./cli/magic.js create",
"config": "node ./cli/magic.js config",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"format": "npx prettier --ignore-path .gitignore --write \"**/*.+(js|ts|jsx|tsx|json|css)\"",
"deploy": "npm run format && npx cdk deploy",
Expand Down

0 comments on commit cb8793d

Please sign in to comment.