Merge branch 'dev' into copyfix

Author: freelerobot

docker/Dockerfile

@@ -2,6 +2,8 @@ FROM ubuntu:22.04 as base
 
 FROM base as build
 
+ARG CORTEX_CPP_VERSION=latest
+
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
@@ -41,9 +43,11 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
 
 WORKDIR /app
 
-COPY . /app/
+COPY ./engine /app/engine
+
+COPY ./docs/static/openapi/cortex.json /app/docs/static/openapi/cortex.json
 
-RUN git submodule update --init && cd engine && make configure-vcpkg && make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=$(git rev-parse HEAD) -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
+RUN cd engine && make configure-vcpkg && make build CMAKE_EXTRA_FLAGS="-DCORTEX_CPP_VERSION=${CORTEX_CPP_VERSION} -DCMAKE_BUILD_TEST=OFF -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
 
 FROM base as runtime
 
@@ -74,6 +78,8 @@ RUN chmod +x /tmp/download-cortex.llamacpp.sh && /bin/bash /tmp/download-cortex.
 # Copy the entrypoint script
 COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
 EXPOSE 39281
 
 HEALTHCHECK --interval=300s --timeout=30s --start-period=10s --retries=3 \

docker/README.md

@@ -10,16 +10,16 @@ This guide will help you set up and run Cortex using Docker.
 1. Clone the Cortex repository
     ```bash
     git clone https://github.com/janhq/cortex.cpp.git
-
-    cd cortex.cpp/docker
+    cd cortex.cpp
+    git submodule update --init
     ```
 2. Build the Docker image
     ```bash
     # Default always uses the latest cortex.cpp and cortex.llamacpp
-    docker build -t cortex .
+    docker build -t cortex --build-arg CORTEX_CPP_VERSION=$(git rev-parse HEAD) -f docker/Dockerfile .
 
     # Use specific version of cortex.cpp and cortex.llamacpp
-    docker build --build-arg CORTEX_LLAMACPP_VERSION=0.1.34 -t cortex .
+    docker build --build-arg CORTEX_LLAMACPP_VERSION=0.1.34 --build-arg CORTEX_CPP_VERSION=$(git rev-parse HEAD) -t cortex -f docker/Dockerfile .
     ```
 
 3. Run the Docker container
@@ -45,4 +45,4 @@ This guide will help you set up and run Cortex using Docker.
     ```bash
     docker exec -it cortex bash
     cortex --help
-    ```
+    ```

docs/docusaurus.config.ts

@@ -20,7 +20,7 @@ const formattedDate = `${month}-${day}-${year}`;
 
 async function fetchDataDaily(date: string) {
   const response = await fetch(
-    `https://delta.jan.ai/openai-api-collection-test/${date}.json`,
+    `https://delta.jan.ai/openai-api-collection-test/${date}.json`
   );
   if (!response.ok) {
     return {};
@@ -120,7 +120,7 @@ const config: Config = {
                 try {
                   let refs = {};
                   const response = await fetch(
-                    `https://huggingface.co/api/models/${model.name}/refs`,
+                    `https://huggingface.co/api/models/${model.name}/refs`
                   );
                   refs = await response.json();
                   fetchedModels.push({
@@ -153,7 +153,7 @@ const config: Config = {
                   path: `/models/${page.name.replace("cortexso/", "")}`,
                   // the page component used to render the page
                   component: require.resolve(
-                    "./src/components/MyModelPage/index.tsx",
+                    "./src/components/MyModelPage/index.tsx"
                   ),
                   // will only match for exactly matching paths
                   exact: true,
@@ -164,7 +164,7 @@ const config: Config = {
                   // in this case, we merge the page data together with the loaded content data
                   customData: { ...page },
                 });
-              }),
+              })
             );
           } catch (error) {
             console.error("Error fetching models:", error);
@@ -201,7 +201,7 @@ const config: Config = {
           changelog.sort(
             (a, b) =>
               new Date(b.frontmatter.date).getTime() -
-              new Date(a.frontmatter.date).getTime(),
+              new Date(a.frontmatter.date).getTime()
           );
           setGlobalData(changelog);
         },
@@ -214,7 +214,7 @@ const config: Config = {
         async contentLoaded({ content, actions }) {
           const { setGlobalData } = actions;
           const fetchRepoInfo = await fetch(
-            "https://api.github.com/repos/janhq/cortex.cpp",
+            "https://api.github.com/repos/janhq/cortex.cpp"
           );
           const repoInfo = await fetchRepoInfo.json();
           setGlobalData(repoInfo);
@@ -227,7 +227,7 @@ const config: Config = {
         async contentLoaded({ content, actions }) {
           const { setGlobalData } = actions;
           const fetchLatestRelease = await fetch(
-            "https://api.github.com/repos/janhq/cortex.cpp/releases/latest",
+            "https://api.github.com/repos/janhq/cortex.cpp/releases/latest"
           );
           const latestRelease = await fetchLatestRelease.json();
           setGlobalData(latestRelease);
@@ -240,7 +240,7 @@ const config: Config = {
         async contentLoaded({ content, actions }) {
           const { setGlobalData } = actions;
           const fetchTotalCoverage = await fetch(
-            "https://delta.jan.ai/openai-api-collection-test/total-coverage.json",
+            "https://delta.jan.ai/openai-api-collection-test/total-coverage.json"
           );
           const totalCoverage = await fetchTotalCoverage.json();
           setGlobalData(totalCoverage);
@@ -410,6 +410,7 @@ const config: Config = {
       items: [
         { to: "/models", label: "Models", position: "left" },
         { to: "/changelog", label: "Changelog", position: "left" },
+        { to: "/contact", label: "Enterprise", position: "left" },
         {
           type: "doc",
           position: "right",

docs/package.json

@@ -17,13 +17,14 @@
     "typecheck": "tsc"
   },
   "dependencies": {
+    "@calcom/embed-react": "^1.5.1",
     "@code-hike/mdx": "^0.9.0",
     "@docsearch/js": "^3.6.0",
     "@docsearch/react": "^3.6.0",
-    "@docusaurus/core": "3.4.0",
-    "@docusaurus/preset-classic": "^3.4.0",
-    "@docusaurus/theme-live-codeblock": "^3.4.0",
-    "@docusaurus/theme-mermaid": "^3.4.0",
+    "@docusaurus/core": "^3.5.2",
+    "@docusaurus/preset-classic": "^3.5.2",
+    "@docusaurus/theme-live-codeblock": "^3.5.2",
+    "@docusaurus/theme-mermaid": "^3.5.2",
     "@excalidraw/excalidraw": "^0.17.6",
     "@huggingface/hub": "^0.15.1",
     "@mdx-js/react": "3.0.1",

docs/src/components/Announcement/index.tsx

@@ -5,12 +5,11 @@ const Announcement = () => {
     <div className="inline-flex items-center justify-center alert px-4 py-3 rounded-xl mx-auto bg-indigo-500 border border-solid border-indigo-800">
       {/* Please change this when cortex stable we can use from latest release endpoint */}
       <div className="flex items-center gap-2">
-        <span>🚧</span>
+        <span>🎉</span>
         <p className="mb-0 text-neutral-100 font-medium">
-          Cortex.cpp v1.0 is now live on github.
-          <a href="/docs" className="no-underline hover:no-underline">
+          <a href="https://github.com/janhq/cortex.cpp/releases/tag/v1.0.1" className="no-underline hover:no-underline">
             {" "}
-            Read more
+            Cortex.cpp v1.0 is now live on GitHub. Check it out!
           </a>
         </p>
       </div>

docs/src/components/PartnerForm/index.tsx

@@ -0,0 +1,18 @@
+import Cal, { getCalApi } from "@calcom/embed-react";
+  import { useEffect } from "react";
+  export default function MyApp() {
+	useEffect(()=>{
+	  (async function () {
+		const cal = await getCalApi({"namespace":"cortex"});
+		cal("ui", {"styles":{"branding":{"brandColor":"#000000"}},"hideEventTypeDetails":false,"layout":"month_view"});
+	  })();
+	}, [])
+	return <Cal namespace="cortex"
+	  calLink="team/homebrew/cortex"
+	  style={{width:"100%",height:"100%",overflow:"scroll"}}
+	  config={{"layout":"month_view"}}
+    
+	  
+	/>;
+  };
+  

docs/src/containers/Homepage/SimpleHeroSection/index.tsx

@@ -28,8 +28,8 @@ const SimpleHeroSection = () => {
 
         <div className="mt-8 flex gap-8 justify-center items-center">
           <DropdownDownload lastRelease={latestRelease} />
-          <Link href="/docs/quickstart" target="_blank">
-            <Button theme="secondary">Documentation</Button>
+          <Link href="/contact" target="_blank">
+            <Button theme="secondary">Schedule a Call</Button>
           </Link>
         </div>
       </div>

docs/src/pages/contact.mdx

@@ -0,0 +1,8 @@
+---
+title: "Cortex Enterprise"
+description: "Cortex lets you run AI models locally on your device or server, enabling you to own your AI. For enterprise usage purposes, schedule a call with us here."
+---
+
+import PartnerForm from '@site/src/components/PartnerForm';
+
+<PartnerForm />