From f2721e767931efdfc0731a877239ba54eafeba9e Mon Sep 17 00:00:00 2001 From: Martin Sosic Date: Fri, 1 Mar 2024 16:18:11 +0100 Subject: [PATCH] Updated Wasp version to 0.12.3 + Mage to use it. --- mage/Dockerfile | 2 +- mage/src/client/pages/ResultPage.jsx | 13 ++++++++++--- waspc/ChangeLog.md | 6 ++++++ .../waspBuild-golden/waspBuild/main.wasp | 2 +- .../waspCompile-golden/waspCompile/main.wasp | 2 +- .../waspComplexTest/main.wasp | 2 +- .../test-outputs/waspJob-golden/waspJob/main.wasp | 2 +- .../waspMigrate-golden/waspMigrate/main.wasp | 2 +- .../test-outputs/waspNew-golden/waspNew/main.wasp | 2 +- waspc/waspc.cabal | 2 +- 10 files changed, 24 insertions(+), 11 deletions(-) diff --git a/mage/Dockerfile b/mage/Dockerfile index dcefc31595..346d918dc8 100644 --- a/mage/Dockerfile +++ b/mage/Dockerfile @@ -41,7 +41,7 @@ RUN cd .wasp/build/server && npm run bundle # TODO: Use pm2? # TODO: Use non-root user (node). FROM base AS server-production -RUN curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v 0.12.2 +RUN curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v 0.12.3 ENV PATH "$PATH:/root/.local/bin" ENV NODE_ENV production WORKDIR /app diff --git a/mage/src/client/pages/ResultPage.jsx b/mage/src/client/pages/ResultPage.jsx index 6d38c118a7..f6de8796c1 100644 --- a/mage/src/client/pages/ResultPage.jsx +++ b/mage/src/client/pages/ResultPage.jsx @@ -456,6 +456,15 @@ export function OnSuccessModal({ isOpen, setIsOpen, appGenerationResult }) { return {children}; } + function calcCostForGpt_3_5_Turbo_0125 (numTokensSpent) { + const estimatedInputTokenShare = 0.8; + const estimatedOutputTokenShare = 1 - estimatedInputTokenShare; + const costInUsdForMillionInputTokens = 0.5; // This is price for GPT 3.5 Turbo 0125. + const costInUsdForMillionOutputTokens = 1.5; // This is price for GPT 3.5 Turbo 0125. + const costInUsdForMillionTokens = costInUsdForMillionInputTokens * estimatedInputTokenShare + costInUsdForMillionOutputTokens * estimatedOutputTokenShare; + return (numTokensSpent / 1e6 * costInUsdForMillionTokens).toFixed(2); + } + return ( Cost to generate your app: {" "} - {`$${((Number(numTokensSpent) / 1000) * 0.004).toFixed( - 2 - )}`}{" "} + {`~$${calcCostForGpt_3_5_Turbo_0125(Number(numTokensSpent))}`}{" "} {numTotalProjects && ( diff --git a/waspc/ChangeLog.md b/waspc/ChangeLog.md index 1ab75cdc76..4cef983354 100644 --- a/waspc/ChangeLog.md +++ b/waspc/ChangeLog.md @@ -1,5 +1,11 @@ # Changelog +## 0.12.3 + +### 🎉 New features + +- Wasp AI switched from GPT 3.5 Turbo 0613 to GPT 3.5 Turbo 0125, which gives it bigger context, ensuring generation doesn't fail for bigger apps, while also being cheaper. + ## 0.12.2 ### 🐞 Bug fixes diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp index 48c81b6e94..157c484368 100644 --- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp +++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp @@ -1,7 +1,7 @@ app waspBuild { db: { system: PostgreSQL }, wasp: { - version: "^0.12.2" + version: "^0.12.3" }, title: "waspBuild" } diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp index 430a3391b9..c9da9df157 100644 --- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp +++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp @@ -1,6 +1,6 @@ app waspCompile { wasp: { - version: "^0.12.2" + version: "^0.12.3" }, title: "waspCompile" } diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp index 7a68a46595..e91dfd6d24 100644 --- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp +++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/main.wasp @@ -1,7 +1,7 @@ app waspComplexTest { db: { system: PostgreSQL }, wasp: { - version: "^0.12.2" + version: "^0.12.3" }, auth: { userEntity: User, diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp index 190e05a81a..6842aacba8 100644 --- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp +++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp @@ -1,7 +1,7 @@ app waspJob { db: { system: PostgreSQL }, wasp: { - version: "^0.12.2" + version: "^0.12.3" }, title: "waspJob" } diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp index 41521325ac..9930ae1cae 100644 --- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp +++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp @@ -1,6 +1,6 @@ app waspMigrate { wasp: { - version: "^0.12.2" + version: "^0.12.3" }, title: "waspMigrate" } diff --git a/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp b/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp index 57f35787a6..7470a07dda 100644 --- a/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp +++ b/waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp @@ -1,6 +1,6 @@ app waspNew { wasp: { - version: "^0.12.2" + version: "^0.12.3" }, title: "waspNew" } diff --git a/waspc/waspc.cabal b/waspc/waspc.cabal index 2140faacf8..01a62c9a87 100644 --- a/waspc/waspc.cabal +++ b/waspc/waspc.cabal @@ -6,7 +6,7 @@ cabal-version: 2.4 -- Consider using hpack, or maybe even hpack-dhall. name: waspc -version: 0.12.2 +version: 0.12.3 description: Please see the README on GitHub at homepage: https://github.com/wasp-lang/wasp/waspc#readme bug-reports: https://github.com/wasp-lang/wasp/issues