Merge pull request #1003 from swirlai/DS-1163-hotfix

cherry from develop, reneable tests fix, small bug

Author: TempleJason

swirl/processors/chatgpt_query.py

@@ -76,17 +76,18 @@ def set_do_filter_from_tags(self):
 
         if filter_tag_value == None or len(filter_tag_value) <= 0:
             self.do_filter = MODEL_DEFAULT_DO_FILTER
-        try:
-            if filter_tag_value.lower() == 'true':
-                self.do_filter = True
-            elif filter_tag_value.lower() == 'false':
-                self.do_filter = False
-            else:
-                logger.error(f"Error parsing filter tag {filter_tag_value} using default: {MODEL_DEFAULT_DO_FILTER}")
+        else:
+            try:
+                if filter_tag_value.lower() == 'true':
+                    self.do_filter = True
+                elif filter_tag_value.lower() == 'false':
+                    self.do_filter = False
+                else:
+                    logger.error(f"Error parsing filter tag {filter_tag_value} using default: {MODEL_DEFAULT_DO_FILTER}")
+                    self.do_filter = MODEL_DEFAULT_DO_FILTER
+            except Exception as x:
+                logger.error(f"Exception parsing filter tag {filter_tag_value} using default: {MODEL_DEFAULT_DO_FILTER}")
                 self.do_filter = MODEL_DEFAULT_DO_FILTER
-        except Exception as x:
-            logger.error(f"Exception parsing filter tag {filter_tag_value} using default: {MODEL_DEFAULT_DO_FILTER}")
-            self.do_filter = MODEL_DEFAULT_DO_FILTER
 
     def process(self):
         try:

swirl/tests/tests.py

@@ -479,7 +479,7 @@ def test_aqp(aqp_test_cases, aqp_test_expected):
         assert actual == aqp_test_expected[i]
         i = i + 1
 
-@pytest.mark.skip(reason="tmp for cgpt")
+@pytest.mark.django_db
 def test_cgptqp_1():
     tc = 'gig economy'
     expected = 'gig economy'
@@ -510,7 +510,7 @@ def test_cgptqp_1():
             ],
             temperature=0)
 
-@pytest.mark.skip(reason="tmp for cgpt")
+@pytest.mark.django_db
 def test_cgptqp_2():
     tc = 'gig economy'
     expected = 'gig economy'
@@ -542,7 +542,7 @@ def test_cgptqp_2():
             ],
             temperature=0)
 
-@pytest.mark.skip(reason="tmp for cgpt")
+@pytest.mark.django_db
 def test_cgptqp_3():
     tc = 'gig economy'
     expected = 'gig economy'
@@ -574,7 +574,7 @@ def test_cgptqp_3():
             ],
             temperature=0)
 
-@pytest.mark.skip(reason="tmp for cgpt")
+@pytest.mark.django_db
 def test_cgptqp_4():
     tc = 'gig economy'
     expected = 'gig economy'
@@ -608,7 +608,7 @@ def test_cgptqp_4():
             temperature=0)
 
 
-@pytest.mark.skip(reason="tmp for cgpt")
+@pytest.mark.django_db
 def test_cgptqp_5():
     tc = 'gig economy'
     expected = 'Gig economy large scale economics'
@@ -644,7 +644,7 @@ def test_cgptqp_5():
             temperature=0)
 
 
-@pytest.mark.skip(reason="tmp for cgpt")
+@pytest.mark.django_db
 def test_cgptqp_6():
     tc = 'gig economy'
     expected = 'gig economy'
@@ -680,7 +680,7 @@ def test_cgptqp_6():
             temperature=0)
 
 
-@pytest.mark.skip(reason="tmp for cgpt")
+@pytest.mark.django_db
 def test_cgptqp_7():
     tc = 'gig economy'
     expected = 'gig economy'