Merge pull request #62 from LlmKira/dev

🐛 fix: Fix issue with uncond_scale comparison in generate_image module

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "novelai-python"
-version = "0.4.10"
+version = "0.4.11"
 description = "NovelAI Python Binding With Pydantic"
 authors = [
     { name = "sudoskys", email = "[email protected]" },

src/novelai_python/sdk/ai/generate_image/__init__.py

@@ -452,8 +452,8 @@ def calculate_cost(self, is_opus: bool = False):
                         * smea_factor
                 )
         per_sample = max(math.ceil(per_sample * strength), 2)
-
-        if int(uncond_scale) != 1:
+        # uncond_scale is not 1.0
+        if not math.isclose(uncond_scale, 1.0, rel_tol=1e-5):
             per_sample = math.ceil(per_sample * 1.3)
 
         return per_sample * n_samples

src/novelai_python/tool/image_metadata/__init__.py

@@ -170,8 +170,8 @@ def load_image(cls,
             title = img.info.get("Title", None)
             prompt = img.info.get("Description", None)
             comment = img.info.get("Comment", None)
-            assert isinstance(comment, str), ValueError("Comment Empty")
             try:
+                assert isinstance(comment, str), ValueError("Comment Empty")
                 comment = json.loads(comment)
             except Exception as e:
                 logger.debug(f"Error loading comment: {e}")