deepecho 0.7.1.dev0__tar.gz → 0.8.1.dev0__tar.gz

{deepecho-0.7.1.dev0 → deepecho-0.8.1.dev0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: deepecho
-Version: 0.7.1.dev0
+Version: 0.8.1.dev0
 Summary: Create sequential synthetic data of mixed types using a GAN.
 Author-email: "DataCebo, Inc." <info@sdv.dev>
-License: BSL-1.1
+License-Expression: BUSL-1.1
 Project-URL: Source Code, https://github.com/sdv-dev/Deepecho/
 Project-URL: Issue Tracker, https://github.com/sdv-dev/Deepecho/issues
 Project-URL: Twitter, https://twitter.com/sdv_dev
@@ -11,7 +11,6 @@ Project-URL: Chat, https://bit.ly/sdv-slack-invite
 Keywords: deepecho,DeepEcho
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: Free for non-commercial use
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9

{deepecho-0.7.1.dev0 → deepecho-0.8.1.dev0}/deepecho/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = 'DataCebo, Inc.'
 __email__ = 'info@sdv.dev'
-__version__ = '0.7.1.dev0'
+__version__ = '0.8.1.dev0'
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
 from deepecho.demo import load_demo

{deepecho-0.7.1.dev0 → deepecho-0.8.1.dev0}/deepecho/models/base.py

@@ -6,6 +6,17 @@ import tqdm
 from deepecho.sequences import assemble_sequences
 
 
+def _format_score(score):
+    """Format a score as a fixed-length string ``±XX.XX``.
+
+    Values are clipped to the range ``[-99.99, +99.99]`` so the result
+    is always exactly 6 characters.
+    """
+    score = max(-99.99, min(99.99, score))
+    sign = '+' if score >= 0 else '-'
+    return f'{sign}{abs(score):05.2f}'
+
+
 class DeepEcho:
     """The base class for DeepEcho models."""
 

{deepecho-0.7.1.dev0 → deepecho-0.8.1.dev0}/deepecho/models/basic_gan.py

@@ -7,7 +7,7 @@ import pandas as pd
 import torch
 from tqdm import tqdm
 
-from deepecho.models.base import DeepEcho
+from deepecho.models.base import DeepEcho, _format_score
 
 LOGGER = logging.getLogger(__name__)
 
@@ -547,7 +547,10 @@ class BasicGANModel(DeepEcho):
             if self._verbose:
                 d_loss = discriminator_score.item()
                 g_loss = generator_score.item()
-                iterator.set_description(f'Epoch {epoch + 1} | D Loss {d_loss} | G Loss {g_loss}')
+                iterator.set_description(
+                    f'Epoch {epoch + 1} | D Loss {_format_score(d_loss)}'
+                    f' | G Loss {_format_score(g_loss)}'
+                )
 
     def sample_sequence(self, context, sequence_length=None):
         """Sample a single sequence conditioned on context.

{deepecho-0.7.1.dev0 → deepecho-0.8.1.dev0}/deepecho/models/par.py

@@ -7,7 +7,7 @@ import pandas as pd
 import torch
 from tqdm import tqdm
 
-from deepecho.models.base import DeepEcho
+from deepecho.models.base import DeepEcho, _format_score
 
 LOGGER = logging.getLogger(__name__)
 
@@ -336,8 +336,8 @@ class PARModel(DeepEcho):
 
         iterator = tqdm(range(self.epochs), disable=(not self.verbose))
         if self.verbose:
-            pbar_description = 'Loss ({loss:.3f})'
-            iterator.set_description(pbar_description.format(loss=0))
+            pbar_description = 'Loss ({loss})'
+            iterator.set_description(pbar_description.format(loss=_format_score(0)))
 
         # Reset loss_values dataframe
         self.loss_values = pd.DataFrame(columns=['Epoch', 'Loss'])
@@ -364,7 +364,7 @@ class PARModel(DeepEcho):
                 self.loss_values = epoch_loss_df
 
             if self.verbose:
-                iterator.set_description(pbar_description.format(loss=loss.item()))
+                iterator.set_description(pbar_description.format(loss=_format_score(loss.item())))
 
             optimizer.step()
 

{deepecho-0.7.1.dev0 → deepecho-0.8.1.dev0}/deepecho.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: deepecho
-Version: 0.7.1.dev0
+Version: 0.8.1.dev0
 Summary: Create sequential synthetic data of mixed types using a GAN.
 Author-email: "DataCebo, Inc." <info@sdv.dev>
-License: BSL-1.1
+License-Expression: BUSL-1.1
 Project-URL: Source Code, https://github.com/sdv-dev/Deepecho/
 Project-URL: Issue Tracker, https://github.com/sdv-dev/Deepecho/issues
 Project-URL: Twitter, https://twitter.com/sdv_dev
@@ -11,7 +11,6 @@ Project-URL: Chat, https://bit.ly/sdv-slack-invite
 Keywords: deepecho,DeepEcho
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
-Classifier: License :: Free for non-commercial use
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9

{deepecho-0.7.1.dev0 → deepecho-0.8.1.dev0}/pyproject.toml

@@ -5,7 +5,6 @@ authors = [{ name = 'DataCebo, Inc.', email = 'info@sdv.dev' }]
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
-    'License :: Free for non-commercial use',
     'Natural Language :: English',
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.9',
@@ -18,7 +17,8 @@ classifiers = [
 ]
 keywords = ['deepecho', 'DeepEcho']
 dynamic = ['version']
-license = { text = 'BSL-1.1' }
+license = 'BUSL-1.1'
+license-files = ['LICENSE']
 requires-python = '>=3.9,<3.15'
 readme = 'README.md'
 dependencies = [
@@ -83,7 +83,6 @@ readme = ['rundoc>=0.4.3,<0.5',]
 
 [tool.setuptools]
 include-package-data = true
-license-files = ['LICENSE']
 
 [tool.setuptools.packages.find]
 include = ['deepecho', 'deepecho.*']
@@ -128,7 +127,7 @@ use_parentheses = true
 collect_ignore = ['pyproject.toml']
 
 [tool.bumpversion]
-current_version = "0.7.1.dev0"
+current_version = "0.8.1.dev0"
 parse = '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?'
 serialize = [
     '{major}.{minor}.{patch}.{release}{candidate}',