scope 0.3.0__tar.gz → 0.3.2__tar.gz

scope-0.3.2/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2024 Danijar Hafner
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{scope-0.3.0/scope.egg-info → scope-0.3.2}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: scope
-Version: 0.3.0
+Version: 0.3.2
 Summary: Metrics logging and analysis
 Home-page: http://github.com/danijar/scope
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
+License-File: LICENSE

{scope-0.3.0 → scope-0.3.2}/requirements.txt

@@ -1,2 +1,3 @@
 av
 numpy
+pillow

{scope-0.3.0 → scope-0.3.2}/scope/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.3.0'
+__version__ = '0.3.2'
 
 from .reader import Reader
 from .writer import Writer

{scope-0.3.0 → scope-0.3.2}/scope/formats.py

@@ -2,7 +2,6 @@ import io
 import struct
 import time
 
-import av
 import numpy as np
 import PIL.Image
 
@@ -127,12 +126,13 @@ class Video:
     return files_read(path)
 
   def encode(self, value):
+    import av
     if value.shape[-1] == 1:
       value = value.repeat(3, -1)
     T, H, W, _ = value.shape
     fp = io.BytesIO()
     output = av.open(fp, mode='w', format=self.ext)
-    stream = output.add_stream(self.codec, rate=float(self.fps))
+    stream = output.add_stream(self.codec, rate=self.fps)
     stream.width = W
     stream.height = H
     stream.pix_fmt = 'yuv420p'
@@ -145,6 +145,7 @@ class Video:
     return fp.getvalue()
 
   def decode(self, buffer):
+    import av
     container = av.open(io.BytesIO(buffer))
     value = []
     for frame in container.decode(video=0):

{scope-0.3.0 → scope-0.3.2}/scope/reader.py

@@ -14,7 +14,8 @@ FORMATS = [
 
 class Reader:
 
-  def __init__(self, logdir, formats=FORMATS):
+  def __init__(self, logdir, formats=None):
+    formats = formats or FORMATS
     if isinstance(logdir, str):
       logdir = pathlib.Path(logdir)
     self.logdir = logdir

{scope-0.3.0 → scope-0.3.2}/scope/writer.py

@@ -7,12 +7,13 @@ import numpy as np
 
 from . import formats
 
+FPS = 10
 
 FORMATS = [
     formats.Text(),
     formats.Float(),
     formats.Image(),
-    formats.Video(),
+    formats.Video(fps=FPS),
 ]
 
 
@@ -28,12 +29,12 @@ class Column:
 
 class Writer:
 
-  def __init__(self, logdir, fps=20, workers=8, formats=FORMATS):
+  def __init__(self, logdir, workers=8, formats=None):
+    formats = formats or FORMATS
     if isinstance(logdir, str):
       logdir = pathlib.Path(logdir)
     self.logdir = logdir
     self.logdir.mkdir(parents=True, exist_ok=True)
-    self.fps = fps
     self.workers = workers
     self.rng = np.random.default_rng(seed=None)
     self.fmts = FORMATS

{scope-0.3.0 → scope-0.3.2/scope.egg-info}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: scope
-Version: 0.3.0
+Version: 0.3.2
 Summary: Metrics logging and analysis
 Home-page: http://github.com/danijar/scope
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Description-Content-Type: text/markdown
+License-File: LICENSE

{scope-0.3.0 → scope-0.3.2}/scope.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 MANIFEST.in
 README.md
 pyproject.toml

{scope-0.3.0 → scope-0.3.2}/scope.egg-info/requires.txt

@@ -1,2 +1,3 @@
 av
 numpy
+pillow

{scope-0.3.0 → scope-0.3.2}/tests/test_video.py

@@ -14,13 +14,17 @@ class TestVideo:
     writer.add(0, {'foo': vid1})
     writer.add(5, {'foo': vid2})
     writer.flush()
-    assert {x.name for x in logdir.glob('*')} == {'foo.mp4'}
-    assert (logdir / 'foo.mp4' / 'index').stat().st_size == (8 + 8) * 2
-    assert len(list((logdir / 'foo.mp4').glob('*'))) == 1 + 2
+    names = {x.name for x in logdir.glob('*')}
+    assert len(names) == 1
+    name = list(names)[0]
+    assert name in ('foo.mp4', 'foo.webm')
+    assert (logdir / name / 'index').stat().st_size == (8 + 8) * 2
+    assert len(list((logdir / name).glob('*'))) == 1 + 2
     reader = scope.Reader(logdir)
     assert reader.keys() == ('foo',)
     assert reader.length('foo') == 2
     steps, filenames = reader['foo']
-    values = [reader.load('foo', x) for x in filenames]
     assert (steps == np.array([0, 5])).all()
-    assert np.allclose(values, [vid1, vid2], rtol=0.1)
+    values = [reader.load('foo', x) for x in filenames]
+    assert all(x.dtype == np.uint8 for x in values)
+    assert np.allclose(values, [vid1, vid2], rtol=0.1, atol=3)