vidformer 0.1.0__tar.gz → 0.2.0__tar.gz

{vidformer-0.1.0 → vidformer-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vidformer
-Version: 0.1.0
+Version: 0.2.0
 Summary: A Python library for creating and viewing videos with vidformer.
 Author-email: Dominik Winecki <dominikwinecki@gmail.com>
 Requires-Python: >=3.8
@@ -13,3 +13,10 @@ Requires-Dist: numpy
 
 # vidformer-py
 
+## Publish
+
+```bash
+ export FLIT_USERNAME='__token__' FLIT_PASSWORD='<token>'
+flit publish
+```
+

vidformer-0.2.0/README.md

@@ -0,0 +1,8 @@
+# vidformer-py
+
+## Publish
+
+```bash
+ export FLIT_USERNAME='__token__' FLIT_PASSWORD='<token>'
+flit publish
+```

{vidformer-0.1.0 → vidformer-0.2.0}/src/vidformer.py

@@ -1,6 +1,6 @@
 """A Python library for creating and viewing videos with vidformer."""
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
 import subprocess
 from fractions import Fraction
@@ -13,6 +13,8 @@ import sys
 import multiprocessing
 import uuid
 import threading
+import gzip
+import base64
 
 import requests
 import msgpack
@@ -80,10 +82,10 @@ class Spec:
 
         from IPython.display import HTML
 
-        spec_pth = f"spec-{str(uuid.uuid4())}.json"
-        with open(spec_pth, "w") as outfile:
-            spec, sources, filters = self._to_json_spec()
-            outfile.write(json.dumps(spec))
+        spec, sources, filters = self._to_json_spec()
+        spec_json_bytes = json.dumps(spec).encode("utf-8")
+        spec_obj_json_gzip = gzip.compress(spec_json_bytes, compresslevel=1)
+        spec_obj_json_gzip_b64 = base64.b64encode(spec_obj_json_gzip).decode("utf-8")
 
         sources = [
             {
@@ -103,14 +105,11 @@ class Spec:
         }
         arrays = []
 
-        print("Sending to server")
-        resp = server._new(spec_pth, sources, filters, arrays, self._fmt)
+        print(f"Sending to server. Spec is {len(spec_obj_json_gzip_b64)} bytes")
+        resp = server._new(spec_obj_json_gzip_b64, sources, filters, arrays, self._fmt)
         hls_video_url = resp["stream_url"]
         namespace = resp["namespace"]
 
-        if not keep_spec:
-            os.remove(spec_pth)
-
         hls_js_url = server.hls_js_url()
 
         # We add a namespace to the video element to avoid conflicts with other videos
@@ -140,13 +139,19 @@ class Spec:
 """
         return HTML(data=html_code)
 
-    def save(self, server, pth, keep_spec=False):
+    def save(self, server, pth, keep_spec=False, encoder=None, encoder_opts=None):
         """Save the video to a file."""
 
-        spec_pth = f"spec-{str(uuid.uuid4())}.json"
-        with open(spec_pth, "w") as outfile:
-            spec, sources, filters = self._to_json_spec()
-            outfile.write(json.dumps(spec))
+        assert encoder is None or type(encoder) == str
+        assert encoder_opts is None or type(encoder_opts) == dict
+        if encoder_opts is not None:
+            for k, v in encoder_opts:
+                assert type(k) == str and type(v) == str
+
+        spec, sources, filters = self._to_json_spec()
+        spec_json_bytes = json.dumps(spec).encode("utf-8")
+        spec_obj_json_gzip = gzip.compress(spec_json_bytes, compresslevel=1)
+        spec_obj_json_gzip_b64 = base64.b64encode(spec_obj_json_gzip).decode("utf-8")
 
         sources = [
             {
@@ -166,10 +171,16 @@ class Spec:
         }
         arrays = []
 
-        resp = server._export(pth, spec_pth, sources, filters, arrays, self._fmt)
-
-        if not keep_spec:
-            os.remove(spec_pth)
+        resp = server._export(
+            pth,
+            spec_obj_json_gzip_b64,
+            sources,
+            filters,
+            arrays,
+            self._fmt,
+            encoder,
+            encoder_opts,
+        )
 
         return resp
 
@@ -245,7 +256,7 @@ class Spec:
         out["dve2_create_spec"] = end_t - start_t
 
         start = time.time()
-        resp = server._export(pth, sources, filters, arrays, self._fmt)
+        resp = server._export(pth, sources, filters, arrays, self._fmt, None, None)
         end = time.time()
         out["dve2_exec"] = end - start
         return out
@@ -310,9 +321,9 @@ class YrdenServer:
 
         return r.json()
 
-    def _export(self, pth, spec_pth, sources, filters, arrays, fmt):
+    def _export(self, pth, spec, sources, filters, arrays, fmt, encoder, encoder_opts):
         req = {
-            "spec": spec_pth,
+            "spec": spec,
             "sources": sources,
             "filters": filters,
             "arrays": arrays,
@@ -320,6 +331,8 @@ class YrdenServer:
             "height": fmt["height"],
             "pix_fmt": fmt["pix_fmt"],
             "output_path": pth,
+            "encoder": encoder,
+            "encoder_opts": encoder_opts,
         }
 
         r = requests.post(f"http://{self._domain}:{self._port}/export", json=req)

vidformer-0.1.0/README.md

@@ -1 +0,0 @@
-# vidformer-py