ihub-cli 1.1.5 → 1.1.7

package/index.js

@@ -10,107 +10,14 @@ import dirtoFileArray from "./recursive_file_extractor.js"
 import { PinataSDK } from "pinata";
 import { provideClient }  from "./dbconnection.js"
 
+import pLimit from "p-limit";
 
-const IHUB_DIR = path.join(os.homedir(), ".ihub");
-const FILE_TO_STORE_LOGIN = path.join(IHUB_DIR, "login.txt");
-
-
-
-async function UpdateRepo(cid,pinata) {
-  
-  
-    const result = await pinata.gateways.public.get(cid)
-    const Data = result.data;
-    console.log(Data)
-    const arrayBuffer = await Data.arrayBuffer()
-    const buffer = Buffer.from(arrayBuffer);
-    console.log(buffer)
-    deleteFilesWithExtension(".history.bundle",".")
-    let dynamicstring=crypto.randomUUID()
-    let shortID = dynamicstring.substring(0, 5)
-    let bpath=`${shortID}.history.bundle`
-
-    fs.writeFileSync(`${bpath}`,buffer);
-
-    //const absolutePath  = path.resolve(folder);
-    const absoluteBundlePath = path.resolve(bpath);
+import {createRepo,uploadFiles,commit} from "@huggingface/hub"
 
-    execSync(`git fetch  ${absoluteBundlePath} refs/heads/*:refs/remotes/bundle/*`, {
-      cwd: `.`,
-      stdio: 'inherit'
-    });
-
-    const currentBranch = execSync(
-          `git branch --show-current`,
-      {
-        cwd: '.',
-        encoding: 'utf8',
-        shell: true
-      }
-      ).trim();
-
-  const bundleBranch = `bundle/${currentBranch}`;
-
-  console.log(`🔀 Merging ${bundleBranch} → ${currentBranch}`);
-  execSync(
-    `git merge ${bundleBranch} --allow-unrelated-histories --no-edit`,
-    {
-      cwd: '.',
-      stdio: 'inherit',
-      shell: true
-    }
-  );
-
-    console.log("pulled successfully")
-
-  }
-
-
-
-async function Pull(folder,pinata,client){
-
-    
-    const db = client.db("ihub_db");
-    const coll = db.collection("ihub_col");
-    const targetManifestId= fs.readFileSync(FILE_TO_STORE_LOGIN,'utf8');
-    const doc = await coll.findOne({
-        "owner": "system",
-        "manifests.id": targetManifestId 
-    });
-    if(doc) {
-
-        let uploads=null
-        let bundle=null
-        let manifests=doc.manifests
-    
-
-    for(let obj of  manifests){
-        
-        let dbfolder=String(obj.folder)
-
-          if(obj.id==targetManifestId && dbfolder==folder){
-              console.log(obj.folder)
-              uploads=obj.uploads
-           }
-
-    
-
-        }
-        console.log(uploads)
-  
-    for(let obj of uploads){
-
-        let name=obj.name
-        const isIncluded = name.includes(".history.bundle");
-        if(isIncluded) {
 
-                bundle=obj.cid
+const IHUB_DIR = path.join(os.homedir(), ".ihub");
+const FILE_TO_STORE_LOGIN = path.join(IHUB_DIR, "login.txt");
 
-          }}
-       
-          await UpdateRepo(bundle,pinata)
-    
-    }}
 
 
 
@@ -128,11 +35,31 @@ async function getcreds() {
   
 }
 
+
+async function getToken(){
+  
+   let request=await fetch("https://immutablehub-creds.hf.space/hft",{
+    mode:"cors",
+    method:"get",
+    headers:{
+      "content-type":"application/json"
+    }
+  })
+  let response=await request.json()
+  return {"hft":response.hft}
+
+}
+
 async function getRuntime() {
+
   const { jwt, gateway } = await getcreds();
   const pinata = new PinataSDK({ pinataJwt: jwt, pinataGateway: gateway });
+  
+
+ 
   const client = provideClient();
   return { pinata, client };
+  
 }
 
 
@@ -182,11 +109,28 @@ function fileWithExtensionExists(extension,folder) {
 
 
 
-  async function deleteManifest(targetManifestId, foldername,client) {
 
 
-  const db = client.db("ihub_db");
-  const coll = db.collection("ihub_col");
+  async function deleteManifest(targetManifestId, foldername,client,mpc,prompt) {
+
+
+
+
+  let db = client.db("ihub_db");
+  let coll = db.collection("ihub_col");
+
+  if (mcp ==true){
+
+      db = client.db("ihub_db");
+      coll = db.collection("mcp_registry");
+
+  }else if(prompt ==true){
+    
+      db = client.db("ihub_db");
+      coll = db.collection("prompt_comp");
+  }
+
+  
   await coll.updateOne(
     { owner: "system" },
     {
@@ -203,6 +147,60 @@ function fileWithExtensionExists(extension,folder) {
 
 
 
+
+//--------------------------------------------------------------------
+
+async function deactivateOlderVersions(targetId, targetFolder,mcp,prompt) {
+
+    let db = client.db("ihub_db");
+    let coll = db.collection("ihub_col");
+
+    if (mcp ==true){
+
+        db = client.db("ihub_db");
+        coll = db.collection("mcp_registry");
+
+    }else if(prompt ==true){
+            db = client.db("ihub_db");
+            coll = db.collection("prompt_comp");
+    }
+
+
+    try {
+        const filter = { 
+                "manifests": { 
+                $elemMatch: { id: targetId, folder: targetFolder } 
+            } 
+        };
+
+        const update = {
+            $set: { "manifests.$[elem].is_latest": false }
+        };
+        const options = {
+            arrayFilters: [
+            { 
+                "elem.id": targetId, 
+                "elem.folder": targetFolder 
+                }
+            ]
+        };
+
+        const result = await coll.updateMany(filter, update, options);
+    
+        console.log(`Matched ${result.matchedCount} docs and updated ${result.modifiedCount} manifests.`);
+        return result;
+    } catch (error) {
+        console.error("Global update failed:", error);
+  }
+}
+
+
+
+
+//-------------------------------------------------------------------------
+
+
+
 async function manifestExists(targetManifestId, foldername,client) {
 
   const db = client.db("ihub_db");
@@ -269,6 +267,7 @@ async function  getFileNew(folder,obj,pinata) {
   const result = await pinata.gateways.public.get(obj.cid)
     const Data = result.data;
     
+    //fs.mkdirSync(folder, { recursive: true });
     const filePath = path.join(folder, obj.name);
     fs.writeFileSync(`${filePath}`,Data,"utf-8");
     console.log("successfully")
@@ -321,15 +320,29 @@ function gitBundler(FOLDER_TO_UPLOAD){
   }
 
 
-async function Clone(folder,pinata,client){
+async function Clone(folder,pinata,client,mcp,prompt){
 
     
-    const db = client.db("ihub_db");
-    const coll = db.collection("ihub_col");
+ 
+      let db = client.db("ihub_db");
+      let coll = db.collection("ihub_col");
+
+        if (mcp ==true){
+
+            db = client.db("ihub_db");
+            coll = db.collection("mcp_registry");
+
+        }
+        else if(prompt ==true){
+            db = client.db("ihub_db");
+            coll = db.collection("prompt_comp");
+        }
+
+
+
     const targetManifestId= fs.readFileSync(FILE_TO_STORE_LOGIN,'utf8');
     const doc = await coll.findOne({
         "owner": "system",
-        "manifests.id": targetManifestId 
     });
     if(doc) {
 
@@ -412,37 +425,57 @@ async function CloneNew(folder,pinata,client){
 
 
 
+async function Push(FOLDER_TO_UPLOAD,pinata,client,mcp,prompt) {
 
+     try {
 
-async function Push(FOLDER_TO_UPLOAD,pinata,client) {
+        let db = client.db("ihub_db");
+        let coll = db.collection("ihub_col");
 
-     try {
+        if (mcp ==true){
 
+            db = client.db("ihub_db");
+            coll = db.collection("mcp_registry");
 
-        const db = client.db("ihub_db");
-        const coll = db.collection("ihub_col");
+        }
+        else if(prompt ==true){
+            db = client.db("ihub_db");
+            coll = db.collection("prompt_comp");
+        }
 
-        let uploads=[]
+        
+
+        //let uploads=[]
         const absolutePath = path.resolve(FOLDER_TO_UPLOAD);
         let files=dirtoFileArray(absolutePath)
 
+/*
         for (let file of files) {
 
             const upload=await pinata.upload.public.file(file)
             uploads.push(upload)
         }
+*/
+        
+
 
+        const limit = pLimit(5); //  5 concurrent uploads
+        const uploadPromises = files.map(file =>
+          limit(() => pinata.upload.public.file(file))
+        );
 
+        const uploads = await Promise.all(uploadPromises);
         console.log(uploads)
         const data = fs.readFileSync(FILE_TO_STORE_LOGIN, 'utf8');
         const lastpath = path.basename(absolutePath);
-
+        
         let meta={"id":data,"folder":lastpath,"uploads":uploads,"is_latest":true}
 
 
         let docalreadyexists=await manifestExists(data,lastpath,client)
         if (docalreadyexists){
-             await deleteManifest(data,lastpath,client)
+             //await deleteManifest(data,lastpath,client,mcp,prompt)
+             await deactivateOlderVersions(data,lastpath,mcp,prompt)
         }
 
         await coll.findOneAndUpdate(
@@ -464,6 +497,254 @@ async function Push(FOLDER_TO_UPLOAD,pinata,client) {
 
 
 
+async function UpdateRepo(cid,pinata) {
+  
+  
+    const result = await pinata.gateways.public.get(cid)
+    const Data = result.data;
+    console.log(Data)
+    const arrayBuffer = await Data.arrayBuffer()
+    const buffer = Buffer.from(arrayBuffer);
+    console.log(buffer)
+    deleteFilesWithExtension(".history.bundle",".")
+    let dynamicstring=crypto.randomUUID()
+    let shortID = dynamicstring.substring(0, 5)
+    let bpath=`${shortID}.history.bundle`
+
+    fs.writeFileSync(`${bpath}`,buffer);
+
+    //const absolutePath  = path.resolve(folder);
+    const absoluteBundlePath = path.resolve(bpath);
+
+    execSync(`git fetch  ${absoluteBundlePath} refs/heads/*:refs/remotes/bundle/*`, {
+      cwd: `.`,
+      stdio: 'inherit'
+    });
+
+    const currentBranch = execSync(
+          `git branch --show-current`,
+      {
+        cwd: '.',
+        encoding: 'utf8',
+        shell: true
+      }
+      ).trim();
+
+  const bundleBranch = `bundle/${currentBranch}`;
+
+  console.log(`🔀 Merging ${bundleBranch} → ${currentBranch}`);
+  execSync(
+    `git merge ${bundleBranch} --allow-unrelated-histories --no-edit`,
+    {
+      cwd: '.',
+      stdio: 'inherit',
+      shell: true
+    }
+  );
+
+    console.log("pulled successfully")
+
+  }
+
+
+
+async function Pull(folder,pinata,client,mcp,prompt){
+
+    
+     let db = client.db("ihub_db");
+     let coll = db.collection("ihub_col");
+
+      if (mcp == true){
+
+            db = client.db("ihub_db");
+            coll = db.collection("mcp_registry");
+
+      }
+      else if(prompt == true){
+            db = client.db("ihub_db");
+            coll = db.collection("prompt_comp");
+      }
+
+
+    const targetManifestId= fs.readFileSync(FILE_TO_STORE_LOGIN,'utf8');
+    const doc = await coll.findOne({
+          "owner": "system",
+    });
+    if(doc) {
+
+        let uploads=null
+        let bundle=null
+        let manifests=doc.manifests
+    
+
+    for(let obj of  manifests){
+        
+        let dbfolder=String(obj.folder)
+
+          if(obj.id==targetManifestId && dbfolder==folder){
+              console.log(obj.folder)
+              uploads=obj.uploads
+           }
+
+    
+
+        }
+        console.log(uploads)
+  
+    for(let obj of uploads){
+
+        let name=obj.name
+        const isIncluded = name.includes(".history.bundle");
+        if(isIncluded) {
+
+                bundle=obj.cid
+
+          }}
+       
+          await UpdateRepo(bundle,pinata)
+    
+    }}
+
+
+
+
+
+async function ensureSpaceExists(name,Token) {
+  try {
+    await createRepo({
+      repo: { type: "space", name: name },
+      accessToken: Token,
+      sdk: "docker", // Required for Spaces
+    });
+    return true
+
+  } catch (error) {
+    // Check if the error is specifically because it already exists
+    if (error.status !== 409) {
+      return true
+    }
+    else{
+      return false
+    }
+  }
+}
+
+
+
+
+
+async function Host(folder,client){
+
+
+
+
+  let token=await getToken()
+  const TT = Buffer.from(token.hft, 'base64').toString('utf-8');
+  const targetManifestId= fs.readFileSync(FILE_TO_STORE_LOGIN,'utf8');
+  const absolutePath = path.resolve(folder);
+  const lastName = path.basename(absolutePath);
+  console.log(lastName);
+  const spaceName = `immutablehub/${lastName}_${targetManifestId}`;
+  const files = [
+    {
+      path: "Dockerfile",
+      content: `
+        #Use a slim Node.js image for faster builds
+        FROM node:18-slim
+
+        #Create and define the working directory
+        WORKDIR /app
+    
+        #Copy package.json and package-lock.json first for better caching
+        COPY package*.json ./
+        
+        #Install dependencies
+        RUN npm install
+
+        #Copy the rest of your application code
+        COPY . .
+
+        #Hugging Face Spaces require port 7860
+        EXPOSE 7860
+        
+        #Start the application
+        CMD ["node", "index.js"]
+
+      `.trim(),
+    },
+    {
+      path: "README.md",
+      content: [
+      '---',
+      'title: Docker Space',
+      'emoji: 🐳',
+      'colorFrom: blue',
+      'colorTo: blue',
+      'sdk: docker',
+      'app_port: 7860', // Highly recommended since you EXPOSE 7860
+      'pinned: false',
+      '---'
+    ].join('\n')
+    },
+  ];
+
+console.log("checking space")
+let exists=await ensureSpaceExists(spaceName,TT)
+if(exists)  {
+
+
+
+let rawFiles=dirtoFileArray(absolutePath)
+console.log(rawFiles)
+
+const filesToUpload = rawFiles
+    .filter(file => {
+      // Replicating your "cleanedFiles" logic
+      const isIgnored = file.name === "package-lock.json" || file.name.includes(".history.bundle");
+      return !isIgnored;
+    })
+    .map(file => {
+      
+      return {
+        path: file.name,    
+        content: file     
+      };
+    });
+
+    //let allFiles=[...files,...filesToUpload]
+    const finalFiles = [...files, ...filesToUpload].map(f => ({
+      path: f.path,
+      //We wrap in a new Blob to strip the 'File' prototype that is causing the error
+      content: new Blob([f.content]) 
+    }));
+
+
+
+     console.log("now uploading")
+      await uploadFiles({
+              repo: { type: "space", name: spaceName },
+              accessToken: TT,
+              files: finalFiles
+          });
+
+
+
+     let db=client.db("ihub_db")
+     let coll=db.collection("hosted")
+
+     
+     await coll.insertOne({"id":targetManifestId,"app":folder,"space":`https://huggingface.co/spaces/${spaceName}`})
+     console.log(`https://huggingface.co/spaces/${spaceName}`)
+    
+  
+  }
+  else{
+    console.log("error in hosting")
+  }
+}
+
+
+
 
 yargs(hideBin(process.argv))
   .command(
@@ -492,7 +773,23 @@ yargs(hideBin(process.argv))
             return yargs.positional('folderpath', {
                 describe: 'The local folder to push',
                 type: 'string'
+            })
+            .option('mcp', { 
+                
+                alias: 'm',
+                type: 'boolean',
+                description: 'mcp server repo or not',
+                default: false
+            })
+             .option('prompt', { 
+                
+                alias: 'p',
+                type: 'boolean',
+                description: 'mcp server repo or not',
+                default: false
             });
+
+             
           },
           async (argv) => {
 
@@ -501,7 +798,7 @@ yargs(hideBin(process.argv))
 
               console.log(`\n⬆️ Starting PUSH operation on folder: ${argv.folderpath}`);
               gitBundler(argv.folderpath);
-              await Push(argv.folderpath,pinata,client);
+              await Push(argv.folderpath,pinata,client,argv.mcp,argv.prompt);
               console.log('Push operation finished.');
 
             }catch(e){
@@ -520,6 +817,20 @@ yargs(hideBin(process.argv))
             return yargs.positional('foldername', {
                 describe: 'the repo/folder to pull',
                 type: 'string'
+            })
+             .option('mcp', { 
+                
+                alias: 'm',
+                type: 'boolean',
+                description: 'mcp server repo or not',
+                default: false
+            })
+             .option('prompt', { 
+                
+                alias: 'p',
+                type: 'boolean',
+                description: 'mcp server repo or not',
+                default: false
             });
           },
           async (argv) => {
@@ -549,7 +860,22 @@ yargs(hideBin(process.argv))
                 describe: 'The folder to clone',
                 type: 'string'
               })
+               .option('mcp', { 
+                
+                alias: 'm',
+                type: 'boolean',
+                description: 'mcp server repo or not',
+                default: false
+            })
+             .option('prompt', { 
+                
+                alias: 'p',
+                type: 'boolean',
+                description: 'mcp server repo or not',
+                default: false
+            })
               .option('new', { 
+
                 alias: 'n',
                 type: 'boolean',
                 description: 'new repo or existing repo',
@@ -566,7 +892,8 @@ yargs(hideBin(process.argv))
             
                 } 
               else {
-                await Clone(argv.foldername,pinata,client);
+
+                await Clone(argv.foldername,pinata,client,argv.mcp,argv.prompt);
                 console.log('Clone operation finished.');
 
               } 
@@ -580,6 +907,34 @@ yargs(hideBin(process.argv))
 
           }
         )
+          .command(
+          'host <foldername>',
+          'hosts a provided nodejs  backend repo',
+          (yargs) => {
+            return yargs.positional('foldername', {
+              describe: 'The repo to host',
+              type: 'string'
+            });
+          },
+          async (argv) => {
+
+
+            const { pinata, client } = await getRuntime();
+
+            try {
+
+            
+            await Host(argv.foldername,client);
+
+            }catch(e){
+              console.log(e);
+            }
+            finally{
+             await  client.close();
+            }
+
+          }
+        )
         .demandCommand(1, 'You must provide a subcommand for "ihub" (login, push, or clone).')
         .help()
     }
@@ -590,7 +945,8 @@ yargs(hideBin(process.argv))
   .example('ihub op push ./repo', 'Push a local repository')
   .example('ihub op clone <reponame> --new true', 'Clone a new repository | name will be the reponame in UI')
   .example('ihub op clone <reponame>', 'Clone an existing repository | name will be the reponame in UI')
-  .example('ihub op clone <reponame>', 'Pull updates in an existing repository | name will be the reponame in UI')
+  .example('ihub op pull <reponame>', 'Pull updates in an existing repository | name will be the reponame in UI')
+  .example('ihub op host <reponame>', 'Hosts a provided nodejs backend repo')
   .epilog('ImmutableHub CLI • Built with ❤️')
   .help()
   .argv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ihub-cli",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "immutablehub cli to push and clone repos",
   "main": "index.js",
   "type": "module",
@@ -13,8 +13,10 @@
   "author": "immutablehub",
   "license": "ISC",
   "dependencies": {
+    "@huggingface/hub": "^2.7.1",
     "jest": "^30.2.0",
     "mongodb": "^7.0.0",
+    "p-limit": "^7.3.0",
     "pinata": "^2.5.1",
     "yargs": "^18.0.0"
   }