Ethosight client server update into running state with proper filesystem structure

Ethosight/Ethosight.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ Ethosight/ReasonerInterface.py
 Ethosight/__init__.py
 Ethosight/langchain_reasoner.py
 Ethosight/llama_index_reasoner.py
+Ethosight/shared_models.py
 Ethosight/utils.py
 Ethosight.egg-info/PKG-INFO
 Ethosight.egg-info/SOURCES.txt

Ethosight/Ethosight/ChatGPTReasoner.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import os
 import openai
 import requests

Ethosight/Ethosight/Ethosight.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 # Ethosight environment variables
 # EthosightBackend: "core" or "client"
 # EthosightBackendURL: URL for EthosightRESTClient backend e.g. http://localhost:8000

Ethosight/Ethosight/EthosightApp.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from .EthosightMediaAnalyzer import EthosightMediaAnalyzer, EthosightOutput 
 from .LabelSpaceOptimization import SemanticRelationsOptimization, SemanticSimilarityOptimization
 from ruamel.yaml import YAML
@@ -33,7 +50,7 @@ def __init__(self, app_name, base_dir="ENV"):
             if not base_dir:
                 raise EthosightAppException("ETHOSIGHT_APP_BASEDIR environment variable is not defined.")
         if not os.path.isdir(base_dir):
-            raise EthosightAppException(f"Base directory {base_dir} is not a valid directory.")
+            raise EthosightAppException(f"Base directory {base_dir} is not a valid directory. Please define a valid directory using ETHOSIGHT_APP_BASEDIR environment variable")
 
         # Ensure the app_dir is an absolute path 
         self.app_dir = os.path.join(base_dir, app_name)
@@ -50,8 +67,9 @@ def __init__(self, app_name, base_dir="ENV"):
         self.embeddings_path = self.config.get('embeddings_path')
         self.labels_path = self.config.get('labels_path')
         self.setActiveEmbeddingsFromFile(self.embeddings_path, self.labels_path)
-        self.groundTruthEmbeddings(makeActive=False)
-        self.reasoner = ChatGPTReasoner()
+        if self.config['benchmark']['enabled']:
+            self.groundTruthEmbeddings(makeActive=False)
+        self.reasoner = self.config['reasoner_type']
 
     def load_config(self, config_file):
         # Assuming the load_config function reads the YAML config file 
@@ -1439,6 +1457,10 @@ def add_labels(self, new_labels):
             for label in current_labels:
                 file.write(f"{label}\n")
 
+        if not added_labels:
+            print("No new labels added.")
+            return
+
         # compute the new embeddings
         new_embeddings = self.ethosight.compute_label_embeddings(added_labels)
 

Ethosight/Ethosight/EthosightAppCLI.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 #!/usr/bin/env python3
 import click
 from .EthosightApp import EthosightApp

Ethosight/Ethosight/EthosightCLI.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 #!/usr/bin/env python3
 import click
 import os

Ethosight/Ethosight/EthosightCore.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import os
 import torch
 from models import imagebind_model
@@ -14,7 +31,7 @@
 import torch.nn.functional as F
 
 class EthosightCore:
-    def __init__(self, model=None, reasoner=None, gpu=0):
+    def __init__(self, model=None, reasoner='', gpu=0):
         #gpu=none means use cpu
         self.ethosight_dir = get_install_path('Ethosight')
         if model is None:
@@ -258,6 +275,11 @@ def compute_affinity_scores(self, label_to_embeddings, image_path, normalize_fn=
         top_labels = sorted_labels[:100]
         top_scores = sorted_scores[:100]
 
+        # Clear memory
+        del vision_embeddings, raw_scores, unique_label_embeddings, inputs
+        if torch.cuda.is_available():
+            torch.cuda.empty_cache()  # Clear unused memory
+
         # Return the labels and scores as a dictionary
         return {'labels': top_labels, 'scores': top_scores}
 

Ethosight/Ethosight/EthosightDatasetCLI.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 #!/usr/bin/env python3
 import os
 import csv

Ethosight/Ethosight/EthosightMediaAnalyzer.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import os
 import copy
 import yaml
@@ -65,6 +82,7 @@ class EthosightMediaAnalyzer:
         'chatgpt': ChatGPTReasoner,
         'langchain': LangchainReasoner,
         'llamaindex': LlamaIndexReasoner,
+        '': ''
 #        'narsgpt': NARSGPTReasoner,
 #        'nars': NARSReasoner,
     }
@@ -116,6 +134,8 @@ def load_reasoner(self, config):
         ReasonerClass = self.REASONER_CLASSES.get(reasoner_type)
         if ReasonerClass is None:
             raise ValueError(f"Invalid reasoner type: {reasoner_type}")
+        if ReasonerClass == '':
+            return ''
         return ReasonerClass()  # assuming reasoner classes have no-arg constructor
 
 

Ethosight/Ethosight/EthosightMediaAnalyzerCLI.py

@@ -1,3 +1,20 @@
+
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 #!/usr/bin/env python3
 import click
 import yaml