Set base url to edge (#70)

* Set base url to edge

* Drop namespace for updates in campaigns

* Fix uploads

* Add test file

Author: ferhatelmas

helloworld.jpg

@@ -483,7 +483,7 @@ async def update_segment(self, segment_id, data):
         """
         Update a segment by id
         """
-        return await self.put(f"segments/{segment_id}", data={"segment": data})
+        return await self.put(f"segments/{segment_id}", data=data)
 
     async def delete_segment(self, segment_id):
         """
@@ -507,13 +507,13 @@ async def list_campaigns(self, **params):
         """
         List campaigns
         """
-        return await self.get("campaigns/", params)
+        return await self.get("campaigns", params)
 
     async def update_campaign(self, campaign_id, data):
         """
         Update a campaign
         """
-        return await self.put(f"campaigns/{campaign_id}", data={"campaign": data})
+        return await self.put(f"campaigns/{campaign_id}", data=data)
 
     async def delete_campaign(self, campaign_id):
         """

stream_chat/async_chat/client.py

@@ -15,9 +15,7 @@ def __init__(self, api_key, api_secret, timeout=6.0, **options):
         self.api_secret = api_secret
         self.timeout = timeout
         self.options = options
-        self.base_url = options.get(
-            "base_url", "https://chat-us-east-1.stream-io-api.com"
-        )
+        self.base_url = options.get("base_url", "https://chat.stream-io-api.com")
         self.auth_token = jwt.encode(
             {"server": True}, self.api_secret, algorithm="HS256"
         )

stream_chat/base/client.py

@@ -319,8 +319,12 @@ def send_file(self, uri, url, name, user, content_type=None):
         }
         parts = urlparse(url)
         if parts[0] == "":
-            url = "file://" + url
-        content = urlopen(Request(url, headers={"User-Agent": "Mozilla/5.0"})).read()
+            with open(url, "rb") as f:
+                content = f.read()
+        else:
+            content = urlopen(
+                Request(url, headers={"User-Agent": "Mozilla/5.0"})
+            ).read()
         response = requests.post(
             f"{self.base_url}/{uri}",
             params=self.get_default_params(),
@@ -471,7 +475,7 @@ def update_segment(self, segment_id, data):
         """
         Update a segment by id
         """
-        return self.put(f"segments/{segment_id}", data={"segment": data})
+        return self.put(f"segments/{segment_id}", data=data)
 
     def delete_segment(self, segment_id):
         """
@@ -501,7 +505,7 @@ def update_campaign(self, campaign_id, data):
         """
         Update a campaign
         """
-        return self.put(f"campaigns/{campaign_id}", data={"campaign": data})
+        return self.put(f"campaigns/{campaign_id}", data=data)
 
     def delete_campaign(self, campaign_id):
         """

stream_chat/client.py

@@ -1,5 +1,4 @@
 import uuid
-
 import pytest
 
 from stream_chat.base.exceptions import StreamAPIException
@@ -29,7 +28,7 @@ async def test_create_without_id(self, event_loop, client, random_users):
         assert channel.id is not None
 
     @pytest.mark.asyncio
-    async def test_send_message_with_optinos(self, event_loop, channel, random_user):
+    async def test_send_message_with_options(self, event_loop, channel, random_user):
         response = await channel.send_message(
             {"text": "hi"}, random_user["id"], skip_push=True
         )
@@ -175,29 +174,19 @@ async def test_get_reactions(self, event_loop, channel, random_user):
 
     @pytest.mark.asyncio
     async def test_send_and_delete_file(self, event_loop, channel, random_user):
-        url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
-        resp = await channel.send_file(url, "lena.png", random_user)
-        assert "lena.png" in resp["file"]
-        resp = await channel.delete_file(resp["file"])
+        url = "helloworld.jpg"
+        resp = await channel.send_file(url, "helloworld.jpg", random_user)
+        assert "helloworld.jpg" in resp["file"]
+        await channel.delete_file(resp["file"])
 
     @pytest.mark.asyncio
     async def test_send_and_delete_image(self, event_loop, channel, random_user):
-        url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
-        resp = await channel.send_image(
-            url, "lena.png", random_user, content_type="image/png"
-        )
-        assert "lena.png" in resp["file"]
-        # resp = channel.delete_image(resp['file'])
-
-    @pytest.mark.asyncio
-    async def test_send_image_with_bot_blocked(self, event_loop, channel, random_user):
-        # following url blocks bots and we set a generic header to skip it
-        # but it can start failing again, see initial discussion here: https://github.com/GetStream/stream-chat-python/pull/30#discussion_r444209891
-        url = "https://api.twilio.com/2010-04-01/Accounts/AC3e136e1a00279f4dadcb10a9f1a1e8a3/Messages/MM547edf6f4846a30231c3033fa20f8419/Media/ME498020f8fe0b0ba2ff83ac99e4782e02"
+        url = "helloworld.jpg"
         resp = await channel.send_image(
-            url, "js.png", random_user, content_type="image/png"
+            url, "helloworld.jpg", random_user, content_type="image/jpeg"
         )
-        assert "js.png" in resp["file"]
+        assert "helloworld.jpg" in resp["file"]
+        await channel.delete_image(resp["file"])
 
     @pytest.mark.asyncio
     async def test_channel_hide_show(self, event_loop, client, channel, random_users):

stream_chat/tests/async_chat/test_channel.py

@@ -26,7 +26,7 @@ def test_create_without_id(self, client, random_users):
         channel.create(random_users[0]["id"])
         assert channel.id is not None
 
-    def test_send_message_with_optinos(self, channel, random_user):
+    def test_send_message_with_options(self, channel, random_user):
         response = channel.send_message(
             {"text": "hi"}, random_user["id"], skip_push=True
         )
@@ -152,25 +152,18 @@ def test_get_reactions(self, channel, random_user):
         assert response["reactions"][0]["count"] == 42
 
     def test_send_and_delete_file(self, channel, random_user):
-        url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
-        resp = channel.send_file(url, "lena.png", random_user)
-        assert "lena.png" in resp["file"]
-        resp = channel.delete_file(resp["file"])
+        url = "helloworld.jpg"
+        resp = channel.send_file(url, "helloworld.jpg", random_user)
+        assert "helloworld.jpg" in resp["file"]
+        channel.delete_file(resp["file"])
 
     def test_send_and_delete_image(self, channel, random_user):
-        url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
+        url = "helloworld.jpg"
         resp = channel.send_image(
-            url, "lena.png", random_user, content_type="image/png"
+            url, "helloworld.jpg", random_user, content_type="image/jpeg"
         )
-        assert "lena.png" in resp["file"]
-        # resp = channel.delete_image(resp['file'])
-
-    def test_send_image_with_bot_blocked(self, channel, random_user):
-        # following url blocks bots and we set a generic header to skip it
-        # but it can start failing again, see initial discussion here: https://github.com/GetStream/stream-chat-python/pull/30#discussion_r444209891
-        url = "https://api.twilio.com/2010-04-01/Accounts/AC3e136e1a00279f4dadcb10a9f1a1e8a3/Messages/MM547edf6f4846a30231c3033fa20f8419/Media/ME498020f8fe0b0ba2ff83ac99e4782e02"
-        resp = channel.send_image(url, "js.png", random_user, content_type="image/png")
-        assert "js.png" in resp["file"]
+        assert "helloworld.jpg" in resp["file"]
+        channel.delete_image(resp["file"])
 
     def test_channel_hide_show(self, client, channel, random_users):
         # setup