Merge remote-tracking branch 'upstream/main' into temp-dev-2

CHANGELOG.md

@@ -2,6 +2,37 @@
 
 
 
+## v0.3.4 (2024-03-13)
+
+### Fix
+
+* fix: Fixed yaml load ([`0582882`](https://github.com/tattle-made/feluda/commit/0582882dec8322ab42bd2f7dc69206677858b633))
+
+* fix: Fixed assert issues ([`33f5fd2`](https://github.com/tattle-made/feluda/commit/33f5fd25a137c9176542be50e5fef39a730ebab0))
+
+* fix: linting issues ([`39d90be`](https://github.com/tattle-made/feluda/commit/39d90beb4caf35d93b4364360796d1932f177510))
+
+* fix: Removed secrets ([`11f4186`](https://github.com/tattle-made/feluda/commit/11f4186526ad0437ca5d62fc78216be5fd90f3fa))
+
+### Unknown
+
+* Merge pull request #170 from tattle-made/hotfix
+
+Hotfix ([`8f4e730`](https://github.com/tattle-made/feluda/commit/8f4e730d757094a0396fb71fb5139bd62c171280))
+
+* Merge pull request #169 from duggalsu/fix_yaml_load
+
+fix: Fixed yaml load ([`ab3851f`](https://github.com/tattle-made/feluda/commit/ab3851f41ce1e7820f1e849e24724edda6c44906))
+
+* Merge pull request #168 from duggalsu/fix_assert_issues
+
+fix: Fixed assert issues ([`1290ef9`](https://github.com/tattle-made/feluda/commit/1290ef9e4d23749dc356da5ff2b2aa650fbfe7ca))
+
+* Merge pull request #167 from duggalsu/fix_secrets
+
+Fix secrets ([`3670bc9`](https://github.com/tattle-made/feluda/commit/3670bc973ae4a0fc699780fa8a3a91b1efcdd4b0))
+
+
 ## v0.3.3 (2024-03-12)
 
 ### Chore

src/core/config.py

@@ -81,6 +81,6 @@ class Config:
 def load(filepath) -> Config:
     log.info("Loading config from " + filepath)
     with open(filepath) as f:
-        parameters = yaml.load(f, Loader=yaml.FullLoader)
+        parameters = yaml.safe_load(f)
     config = from_dict(data_class=Config, data=parameters)
     return config

src/core/operators/vid_vec_rep_resnet.py

@@ -212,7 +212,7 @@ def hook(m, i, o):
             res = np.hstack(res)
             print("res.shape:", res.shape)
             print("sys.getsizeof(res)", sys.getsizeof(res))
-            assert res.shape == (512, image_count)
+            # assert res.shape == (512, image_count)
             return res
 
         def find_keyframes(self, feature_matrix):

src/reporter.py

@@ -3,16 +3,9 @@
 from core.feluda import ComponentType, Feluda
 from core.logger import Logger
 import json
-import requests
-from os import environ
 
 log = Logger(__name__)
 
-secret = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMwN2IzMTYwLTE3MjktNDI2MS04MjExLTU1YzFlOTc1ZWQ2NCIsInVzZXJuYW1lIjoiYWRtaW4iLCJyb2xlIjoiYWRtaW4iLCJpYXQiOjE2NDI2Nzc4MTh9.p9UZ1xt1kOSyBTBMr3IoeONroZZVJYfUHcM7d9CHdR0"
-headersAuth = {
-    "Authorization": "Basic " + str(secret),
-}
-
 
 def reporter(ch, method, properties, body):
     print("MESSAGE RECEIVED")
@@ -23,12 +16,6 @@ def reporter(ch, method, properties, body):
     log.prettyprint(report)
 
     try:
-        requests.post(
-            environ.get("KOSH_API_URL") + "/index/report",
-            headers=headersAuth,
-            json=report,
-            timeout=(3.05, 5),
-        )
         ch.basic_ack(delivery_tag=method.delivery_tag)
     except Exception:
         log.exception("Error Reporting Index Status")

src/tests/endpoint/test_handlers.py

@@ -14,4 +14,4 @@ def setUp(self) -> None:
     def test_health(self):
         rv = self.app.get("/health")
         print(rv.status_code)
-        assert rv.status_code == 200
+        self.assertEqual(rv.status_code, 200)

src/tests/endpoint/test_health_api.py

@@ -15,4 +15,4 @@ def setUp(self) -> None:
     def test_health(self):
         rv = self.app.get("/health")
         print(rv.status_code)
-        assert rv.status_code == 200
+        self.assertEqual(rv.status_code, 200)

src/tests/endpoint/test_index_api.py

@@ -31,4 +31,4 @@ def test_index_text_url(self):
         }
         rv = self.app.post("/index", files=files)
         print(rv.data)
-        assert rv.status_code == 200
+        self.assertEqual(rv.status_code, 200)