refactor: Update imports and class names in ipfs_model_manager.js

endomorphosis · Aug 16, 2024 · 162b859 · 162b859
1 parent e7e16cd
commit 162b859
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/config/config.js b/config/config.js
@@ -39,7 +39,17 @@ export function loadConfig(self, configPath, overrides = None){
 }
 
 export function requireConfig(opts){
-	const configPath = findConfig() || opts.config
+	if (opts != undefined){
+		if (Object.keys(opts).includes('config')){
+			const configPath = opts.config
+		}
+		else{
+			const configPath = findConfig()
+		}
+	}
+	else{
+		const configPath = findConfig()
+	}
 
 	if(!configPath){
 		console.error(`no config file found`)

diff --git a/ipfs_model_manager_js/ipfs_model_manager.js b/ipfs_model_manager_js/ipfs_model_manager.js
@@ -14,6 +14,8 @@ import rimraf from 'rimraf';
 import _ from 'lodash';
 import * as temp_file from "./tmp_file.js";
 import { execSync } from 'child_process';
+import { requireConfig } from '../config/config.js';
+
 
 const readFile = util.promisify(fs.readFile);
 const writeFile = util.promisify(fs.writeFile);
@@ -24,7 +26,17 @@ const tmpFile = new temp_file.TempFileManager()
 
 class ModelManager {
     constructor(resources = null, meta = null) {
-
+        this.thisDir = path.dirname(import.meta.url);
+        if (this.thisDir.startsWith("file://")) {
+            this.thisDir = this.thisDir.replace("file://", "");
+        }
+        this.parentDir = path.dirname(this.thisDir);
+        if (fs.existsSync(path.join(this.parentDir, "config", "config.toml"))) {
+            this.config = new requireConfig({config: path.join(this.parentDir, "config", "config.toml")});
+        }
+        else{
+            // this.config = new requireConfig();
+        }
         this.models = {
             "s3_models": [],
             "ipfs_models": [],