Bump version to 0.3.8

Author: howethomas

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vcon"
-version = "0.3.7"
+version = "0.3.8"
 description = "The vCon library"
 authors = ["Thomas McCarthy-Howe <ghostofbasho@gmail.com>"]
 license = "MIT"

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="vcon",
-    version="0.3.6",
+    version="0.3.8",
     author="Thomas McCarthy-Howe",
     author_email="ghostofbasho@gmail.com",
     description="A package for working with vCon containers",
@@ -19,4 +19,4 @@
         "Operating System :: OS Independent",
     ],
     python_requires=">=3.6",
-)
+)

src/vcon/dialog.py

@@ -156,13 +156,15 @@ def add_external_data(self, url: str, filename: str, mimetype: str) -> None:
         else:
             raise Exception(f"Failed to fetch external data: {response.status_code}")
 
-        # Overide the filename if provided, otherwise use the filename from the URL
+        # Override the filename if provided, otherwise use the filename from the URL
         if filename:
             self.filename = filename
         else:
-            self.filename = url.split("/")[-1]
+            # Extract filename from URL, removing any query parameters
+            url_path = url.split("?")[0]
+            self.filename = url_path.split("/")[-1]
 
-        # Overide the mimetype if provided, otherwise use the mimetype from the URL
+        # Override the mimetype if provided, otherwise use the mimetype from the URL
         if mimetype:
             self.mimetype = mimetype
 
@@ -282,30 +284,33 @@ def to_inline_data(self) -> None:
         :return: None
         :rtype: None
         """
+        # Ensure filename attribute exists
+        if not hasattr(self, "filename"):
+            self.filename = None
+
         # Read the contents from the URL
         response = requests.get(self.url)
         if response.status_code == 200:
-            self.body = response.text
-            self.mimetype = response.headers["Content-Type"]
+            # For binary content, use response.content instead of response.text
+            raw_content = response.content
+            # Base64url encode the body
+            self.body = base64.urlsafe_b64encode(raw_content).decode()
+            self.mimetype = response.headers.get("Content-Type")
         else:
             raise Exception(f"Failed to fetch external data: {response.status_code}")
 
-        # Calculate the SHA-256 hash of the body as the signature
+        # Calculate the SHA-256 hash of the original binary content
         self.alg = "sha256"
         self.encoding = "base64url"
         self.signature = base64.urlsafe_b64encode(
-            hashlib.sha256(self.body.encode()).digest()
+            hashlib.sha256(raw_content).digest()
         ).decode()
 
-        # Overide the filename if provided, otherwise use the filename from the URL
-        if self.filename:
-            self.filename = self.filename
-        else:
-            self.filename = self.url.split("/")[-1]
-
-        # Overide the mimetype if provided, otherwise use the mimetype from the URL
-        if self.mimetype:
-            self.mimetype = self.mimetype
+        # Set the filename if not already provided
+        if not self.filename:
+            # Extract filename from URL, removing any query parameters
+            url_path = self.url.split("?")[0]
+            self.filename = url_path.split("/")[-1]
 
-        # Add the body to the dialog
-        self.add_inline_data(self.body, self.filename, self.mimetype)
+        # Remove the url since this is now inline data
+        delattr(self, "url")

tests/test_dialog.py

@@ -2,6 +2,9 @@
 from src.vcon.dialog import Dialog
 import hashlib
 import base64
+import requests
+from unittest.mock import Mock, patch
+from datetime import datetime
 
 
 class TestDialog:
@@ -346,7 +349,7 @@ def test_handles_invalid_datetime_string(self):
             Dialog(type="text", start="invalid-datetime", parties=[1, 2, 3])
 
     # Converts start time to ISO 8601 string if provided as datetime
-    def test_convert_start_time_to_iso_string(self):
+    def test_convert_datetime_to_iso_string(self):
         from datetime import datetime
         from src.vcon.dialog import Dialog
         from unittest.mock import patch
@@ -365,7 +368,7 @@ def test_convert_start_time_to_iso_string(self):
         assert dialog.start == "2022-09-15T10:30:00"
 
     # Converts start time to ISO 8601 string if provided as string
-    def test_convert_start_time_to_iso_string(self):
+    def test_convert_string_to_iso_string(self):
         from datetime import datetime
         from src.vcon.dialog import Dialog
         from unittest.mock import patch
@@ -379,3 +382,63 @@ def test_convert_start_time_to_iso_string(self):
             dialog = Dialog(type="text", start=start_time, parties=[1, 2, 3])
 
             assert dialog.start == expected_iso_time
+
+    def test_to_inline_data_binary(self):
+        # Create some fake binary audio data
+        fake_binary_data = (
+            b"\x52\x49\x46\x46\x24\x08\x00\x00\x57\x41\x56\x45"  # WAV header snippet
+        )
+
+        # Mock the requests.get response
+        mock_response = Mock()
+        mock_response.status_code = 200
+        mock_response.content = fake_binary_data
+        mock_response.headers = {"Content-Type": "audio/x-wav"}
+
+        # Create a dialog with external data
+        dialog = Dialog(
+            type="audio",
+            start=datetime.now(),
+            parties=[1, 2],
+            url="http://example.com/audio.wav",
+        )
+
+        # Mock the requests.get call
+        with patch("requests.get", return_value=mock_response):
+            dialog.to_inline_data()
+
+        # Verify the conversion was successful
+        assert not hasattr(dialog, "url")  # URL should be removed
+        assert dialog.mimetype == "audio/x-wav"
+        assert dialog.filename == "audio.wav"
+        assert dialog.encoding == "base64url"
+        assert dialog.alg == "sha256"
+
+        # Decode the base64url body and verify it matches original content
+        decoded_body = base64.urlsafe_b64decode(dialog.body.encode())
+        assert decoded_body == fake_binary_data
+
+        # Verify the signature matches the content
+        expected_signature = base64.urlsafe_b64encode(
+            hashlib.sha256(fake_binary_data).digest()
+        ).decode()
+        assert dialog.signature == expected_signature
+
+    def test_to_inline_data_failed_request(self):
+        # Create a dialog with external data
+        dialog = Dialog(
+            type="audio",
+            start=datetime.now(),
+            parties=[1, 2],
+            url="http://example.com/audio.wav",
+        )
+
+        # Mock a failed request
+        mock_response = Mock()
+        mock_response.status_code = 404
+
+        # Verify that the conversion raises an exception
+        with patch("requests.get", return_value=mock_response):
+            with pytest.raises(Exception) as exc_info:
+                dialog.to_inline_data()
+            assert "Failed to fetch external data: 404" in str(exc_info.value)