From 2b1adb0b42c663b7f99c230caf80833425a8a208 Mon Sep 17 00:00:00 2001
From: Paul Ccari <46382556+paulclindo@users.noreply.github.com>
Date: Tue, 20 Aug 2024 12:39:59 -0500
Subject: [PATCH] fix: remove shinkai hosting options (#411)

* update tools UI

* remove shinkai hosting options

* remove shinkai hosting options

* bump version v0.7.34
---
 .../resources-banner.tsx                      |   1 -
 .../shinkai-node-manager/ollama-models.tsx    | 154 ++++++++----------
 .../shinkai-desktop/src/pages/get-started.tsx |  46 +++---
 apps/shinkai-desktop/src/pages/tools.tsx      |   2 +-
 .../connect-method-quick-start.tsx            |  49 +++---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 7 files changed, 122 insertions(+), 136 deletions(-)

diff --git a/apps/shinkai-desktop/src/components/hardware-capabilities/resources-banner.tsx b/apps/shinkai-desktop/src/components/hardware-capabilities/resources-banner.tsx
index 25ba4f804..7ed100951 100644
--- a/apps/shinkai-desktop/src/components/hardware-capabilities/resources-banner.tsx
+++ b/apps/shinkai-desktop/src/components/hardware-capabilities/resources-banner.tsx
@@ -2,7 +2,6 @@ import {
   Alert,
   AlertDescription,
   AlertTitle,
-  TextLink,
   Tooltip,
   TooltipContent,
   TooltipPortal,
diff --git a/apps/shinkai-desktop/src/components/shinkai-node-manager/ollama-models.tsx b/apps/shinkai-desktop/src/components/shinkai-node-manager/ollama-models.tsx
index cea6012eb..22cf40b61 100644
--- a/apps/shinkai-desktop/src/components/shinkai-node-manager/ollama-models.tsx
+++ b/apps/shinkai-desktop/src/components/shinkai-node-manager/ollama-models.tsx
@@ -14,21 +14,11 @@ import {
   CardTitle,
 } from '@shinkai_network/shinkai-ui';
 import { cn } from '@shinkai_network/shinkai-ui/utils';
-import {
-  ALargeSmall,
-  BookOpenText,
-  Database,
-  Images,
-  List,
-  Star,
-} from 'lucide-react';
+import { BookOpenText, Database, List, Star } from 'lucide-react';
 import { useState } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
-import {
-  OLLAMA_MODELS,
-  OllamaModelCapability,
-} from '../../lib/shinkai-node-manager/ollama-models';
+import { OLLAMA_MODELS } from '../../lib/shinkai-node-manager/ollama-models';
 import {
   useShinkaiNodeGetDefaultModel,
   useShinkaiNodeIsRunningQuery,
@@ -81,78 +71,74 @@ export const OllamaModels = () => {
           <div className="flex w-full flex-row flex-wrap items-center justify-center gap-2">
             {OLLAMA_MODELS.map((model) => {
               return (
-                <>
-                  <Card
-                    className="grid h-[500px] w-[260px] grid-flow-row"
-                    key={model.fullName}
-                  >
-                    <CardHeader className="">
-                      <CardTitle className="text-md">
-                        <span>{model.name}</span>
-                      </CardTitle>
-                      <div className="mt-2 h-[40px]">
-                        {isDefaultModel(model.fullName) && (
-                          <Badge
-                            className={cn(
-                              'rounded-md border-0 px-2 py-1 font-normal capitalize',
-                              'bg-emerald-900 text-emerald-400',
-                            )}
-                            variant="outline"
-                          >
-                            {t('common.recommended')}
-                          </Badge>
-                        )}
-                      </div>
-                      <CardDescription className="h-full overflow-hidden text-ellipsis">
-                        {model.description}
-                      </CardDescription>
-                    </CardHeader>
-                    <CardContent className="flex flex-col space-y-1 text-xs">
-                      <div className="flex h-[75px] flex-col space-y-1">
-                        {model.capabilities.map((capability) => (
-                          <ModelCapabilityTag
-                            capability={capability}
-                            key={capability}
-                          />
-                        ))}
-                      </div>
-                      <div className="pb-2 pt-0">
-                        <Separator />
-                      </div>
-                      <ModelQuailityTag quality={model.quality} />
-                      <ModelSpeedTag speed={model.speed} />
-                      <Badge
-                        className={cn(
-                          'justify-center rounded-full px-2 py-1 font-normal capitalize',
-                        )}
-                        variant="outline"
-                      >
-                        <BookOpenText className="h-4 w-4" />
-                        <span className="ml-2 overflow-hidden text-ellipsis">
-                          {t('shinkaiNode.models.labels.bookPages', {
-                            pages: Math.round(
-                              (model.contextLength * 0.75) / 380,
-                            ),
-                          })}
-                        </span>
-                      </Badge>
-                      <Badge
-                        className={cn(
-                          'justify-center rounded-full px-2 py-1 font-normal capitalize',
-                        )}
-                        variant="outline"
-                      >
-                        <Database className="mr-2 h-4 w-4" />
-                        <span className="ml-2 overflow-hidden text-ellipsis">
-                          {model.size} GB
-                        </span>
-                      </Badge>
-                    </CardContent>
-                    <CardFooter className="flex h-[75px] flex-row items-center justify-center">
-                      <OllamaModelInstallButton model={model.fullName} />
-                    </CardFooter>
-                  </Card>
-                </>
+                <Card
+                  className="grid h-[500px] w-[260px] grid-flow-row"
+                  key={model.fullName}
+                >
+                  <CardHeader className="">
+                    <CardTitle className="text-md">
+                      <span>{model.name}</span>
+                    </CardTitle>
+                    <div className="mt-2 h-[40px]">
+                      {isDefaultModel(model.fullName) && (
+                        <Badge
+                          className={cn(
+                            'rounded-md border-0 px-2 py-1 font-normal capitalize',
+                            'bg-emerald-900 text-emerald-400',
+                          )}
+                          variant="outline"
+                        >
+                          {t('common.recommended')}
+                        </Badge>
+                      )}
+                    </div>
+                    <CardDescription className="h-full overflow-hidden text-ellipsis">
+                      {model.description}
+                    </CardDescription>
+                  </CardHeader>
+                  <CardContent className="flex flex-col space-y-1 text-xs">
+                    <div className="flex h-[75px] flex-col space-y-1">
+                      {model.capabilities.map((capability) => (
+                        <ModelCapabilityTag
+                          capability={capability}
+                          key={capability}
+                        />
+                      ))}
+                    </div>
+                    <div className="pb-2 pt-0">
+                      <Separator />
+                    </div>
+                    <ModelQuailityTag quality={model.quality} />
+                    <ModelSpeedTag speed={model.speed} />
+                    <Badge
+                      className={cn(
+                        'justify-center rounded-full px-2 py-1 font-normal capitalize',
+                      )}
+                      variant="outline"
+                    >
+                      <BookOpenText className="h-4 w-4" />
+                      <span className="ml-2 overflow-hidden text-ellipsis">
+                        {t('shinkaiNode.models.labels.bookPages', {
+                          pages: Math.round((model.contextLength * 0.75) / 380),
+                        })}
+                      </span>
+                    </Badge>
+                    <Badge
+                      className={cn(
+                        'justify-center rounded-full px-2 py-1 font-normal capitalize',
+                      )}
+                      variant="outline"
+                    >
+                      <Database className="mr-2 h-4 w-4" />
+                      <span className="ml-2 overflow-hidden text-ellipsis">
+                        {model.size} GB
+                      </span>
+                    </Badge>
+                  </CardContent>
+                  <CardFooter className="flex h-[75px] flex-row items-center justify-center">
+                    <OllamaModelInstallButton model={model.fullName} />
+                  </CardFooter>
+                </Card>
               );
             })}
           </div>
diff --git a/apps/shinkai-desktop/src/pages/get-started.tsx b/apps/shinkai-desktop/src/pages/get-started.tsx
index 6122db0ba..252e629ee 100644
--- a/apps/shinkai-desktop/src/pages/get-started.tsx
+++ b/apps/shinkai-desktop/src/pages/get-started.tsx
@@ -6,9 +6,8 @@ import {
 } from '@shinkai_network/shinkai-node-state/forms/auth/quick-connection';
 import { useSubmitRegistrationNoCode } from '@shinkai_network/shinkai-node-state/lib/mutations/submitRegistation/useSubmitRegistrationNoCode';
 import { useGetEncryptionKeys } from '@shinkai_network/shinkai-node-state/lib/queries/getEncryptionKeys/useGetEncryptionKeys';
-import { Button, buttonVariants, Separator } from '@shinkai_network/shinkai-ui';
+import { Button } from '@shinkai_network/shinkai-ui';
 import { submitRegistrationNoCodeError } from '@shinkai_network/shinkai-ui/helpers';
-import { cn } from '@shinkai_network/shinkai-ui/utils';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { Link, useNavigate } from 'react-router-dom';
@@ -113,11 +112,11 @@ const GetStartedPage = () => {
         onRestore={() => onRestoreConfirmation()}
         open={resetStorageBeforeConnectConfirmationPromptOpen}
       />
-      <div className="mx-auto flex h-full max-w-lg flex-col">
+      <div className="mx-auto flex h-full max-w-md flex-col gap-14">
         <p className="text-gray-80 text-center text-base tracking-wide">
           {t('desktop.welcome')} <span aria-hidden> 🔑</span>
         </p>
-        <div className="mt-10 flex flex-1 flex-col gap-10">
+        <div className="flex flex-1 flex-col gap-4">
           <div className="space-y-4">
             <Button
               className="w-full"
@@ -133,26 +132,27 @@ const GetStartedPage = () => {
             </Button>
             <ResourcesBanner />
           </div>
-          <Separator className="relative" decorative>
-            <span className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 bg-gray-500 p-2 text-gray-100">
-              or
-            </span>
-          </Separator>
+          {/*<Separator className="relative" decorative>*/}
+          {/*  <span className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 bg-gray-500 p-2 text-gray-100">*/}
+          {/*    or*/}
+          {/*  </span>*/}
+          {/*</Separator>*/}
           <div className="space-y-4">
-            <a
-              className={cn(
-                buttonVariants({
-                  variant: 'ghost',
-                  size: 'lg',
-                }),
-                'w-full',
-              )}
-              href="https://www.shinkai.com/sign-in"
-              rel="noreferrer"
-              target="_blank"
-            >
-              {t('common.logInShinkaiHosting')}
-            </a>
+            {/* Disable Shinkai Hosting */}
+            {/*<a*/}
+            {/*  className={cn(*/}
+            {/*    buttonVariants({*/}
+            {/*      variant: 'ghost',*/}
+            {/*      size: 'lg',*/}
+            {/*    }),*/}
+            {/*    'w-full',*/}
+            {/*  )}*/}
+            {/*  href="https://www.shinkai.com/sign-in"*/}
+            {/*  rel="noreferrer"*/}
+            {/*  target="_blank"*/}
+            {/*>*/}
+            {/*  {t('common.logInShinkaiHosting')}*/}
+            {/*</a>*/}
             {/*<a*/}
             {/*  className={cn(*/}
             {/*    buttonVariants({*/}
diff --git a/apps/shinkai-desktop/src/pages/tools.tsx b/apps/shinkai-desktop/src/pages/tools.tsx
index 2e0d8ad60..fd4e86594 100644
--- a/apps/shinkai-desktop/src/pages/tools.tsx
+++ b/apps/shinkai-desktop/src/pages/tools.tsx
@@ -96,7 +96,7 @@ export const Tools = () => {
             </Button>
           )}
         </div>
-        <div className="grid grid-cols-2 gap-4">
+        <div className="grid grid-cols-1 gap-4">
           {(isPending || !isSearchQuerySynced || isSearchToolListPending) &&
             Array.from({ length: 8 }).map((_, idx) => (
               <div
diff --git a/apps/shinkai-visor/src/components/connect-method-quick-start/connect-method-quick-start.tsx b/apps/shinkai-visor/src/components/connect-method-quick-start/connect-method-quick-start.tsx
index a01e14828..3a2e93ef9 100644
--- a/apps/shinkai-visor/src/components/connect-method-quick-start/connect-method-quick-start.tsx
+++ b/apps/shinkai-visor/src/components/connect-method-quick-start/connect-method-quick-start.tsx
@@ -173,30 +173,31 @@ export const ConnectMethodQuickStart = () => {
             </Button>
           </form>
         </Form>
-        <div className="text-gray-80 space-y-4 py-8 pt-12 text-center text-sm">
-          {/*<p>*/}
-          {/*  Don’t have an account?{' '}*/}
-          {/*  <a*/}
-          {/*    className="font-semibold text-white underline"*/}
-          {/*    href="https://www.shinkai.com/sign-up"*/}
-          {/*    rel="noreferrer"*/}
-          {/*    target={'_blank'}*/}
-          {/*  >*/}
-          {/*    Sign up*/}
-          {/*  </a>*/}
-          {/*</p>*/}
-          <p>
-            Already have an account?{' '}
-            <a
-              className="font-semibold text-white underline"
-              href="https://www.shinkai.com/user"
-              rel="noreferrer"
-              target={'_blank'}
-            >
-              Click here to connect
-            </a>
-          </p>
-        </div>
+        {/* Disable shinkai hosting */}
+        {/*<div className="text-gray-80 space-y-4 py-8 pt-12 text-center text-sm">*/}
+        {/*<p>*/}
+        {/*  Don’t have an account?{' '}*/}
+        {/*  <a*/}
+        {/*    className="font-semibold text-white underline"*/}
+        {/*    href="https://www.shinkai.com/sign-up"*/}
+        {/*    rel="noreferrer"*/}
+        {/*    target={'_blank'}*/}
+        {/*  >*/}
+        {/*    Sign up*/}
+        {/*  </a>*/}
+        {/*</p>*/}
+        {/*  <p>*/}
+        {/*    Already have an account?{' '}*/}
+        {/*    <a*/}
+        {/*      className="font-semibold text-white underline"*/}
+        {/*      href="https://www.shinkai.com/user"*/}
+        {/*      rel="noreferrer"*/}
+        {/*      target={'_blank'}*/}
+        {/*    >*/}
+        {/*      Click here to connect*/}
+        {/*    </a>*/}
+        {/*  </p>*/}
+        {/*</div>*/}
       </div>
 
       <div className="flex gap-4">
diff --git a/package-lock.json b/package-lock.json
index 35d010c08..03009fb60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@shinkai/source",
-  "version": "0.7.33",
+  "version": "0.7.34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@shinkai/source",
-      "version": "0.7.33",
+      "version": "0.7.34",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN LICENSE",
       "workspaces": [
diff --git a/package.json b/package.json
index 534ac1388..c92cff209 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shinkai/source",
-  "version": "0.7.33",
+  "version": "0.7.34",
   "license": "SEE LICENSE IN LICENSE",
   "files": [
     "LICENSE"