Allow Service URl as base URL

README.md

@@ -98,7 +98,7 @@ from atproto import Client
 
 client = Client()
 # By default, it uses the server of bsky.app. To change this behavior, pass the base api URL to constructor
-# Client('https://my.awesome.server/xrpc')
+# Client('https://example.com')
 ```
 
 For async:
@@ -107,7 +107,7 @@ from atproto import AsyncClient
 
 client = AsyncClient()
 # By default, it uses the server of bsky.app. To change this behavior, pass the base api URL to constructor
-# AsyncClient('https://my.awesome.server/xrpc')
+# AsyncClient('https://example.com')
 ```
 
 In the snippets below, only the sync version will be presented.

docs/source/readme.content.md

@@ -22,7 +22,7 @@ from atproto import Client
 
 client = Client()
 # By default, it uses the server of bsky.app. To change this behavior, pass the base api URL to constructor
-# Client('https://my.awesome.server/xrpc')
+# Client('https://example.com')
 ```
 
 For async:
@@ -31,7 +31,7 @@ from atproto import AsyncClient
 
 client = AsyncClient()
 # By default, it uses the server of bsky.app. To change this behavior, pass the base api URL to constructor
-# AsyncClient('https://my.awesome.server/xrpc')
+# AsyncClient('https://example.com')
 ```
 
 In the snippets below, only the sync version will be presented.

packages/atproto_client/client/base.py

@@ -44,17 +44,25 @@ def _handle_kwagrs(kwargs: dict) -> None:
     kwargs.pop('output_encoding', None)
 
 
+def _handle_base_url(base_url: t.Optional[str] = None) -> str:
+    if base_url is None:
+        return _BASE_API_URL
+
+    if not base_url.endswith('/xrpc'):
+        return f'{base_url.rstrip("/")}/xrpc'
+
+    return base_url
+
+
 class ClientBase:
     """Low-level methods are here."""
 
     def __init__(self, base_url: t.Optional[str] = None, request: t.Optional[Request] = None) -> None:
         if request is None:
             request = Request()
-        if base_url is None:
-            base_url = _BASE_API_URL
 
         self._request = request
-        self._base_url = base_url
+        self._base_url = _handle_base_url(base_url)
 
     @property
     def request(self) -> Request:
@@ -95,11 +103,9 @@ class AsyncClientBase:
     def __init__(self, base_url: t.Optional[str] = None, request: t.Optional[AsyncRequest] = None) -> None:
         if request is None:
             request = AsyncRequest()
-        if base_url is None:
-            base_url = _BASE_API_URL
 
         self._request = request
-        self._base_url = base_url
+        self._base_url = _handle_base_url(base_url)
 
     @property
     def request(self) -> AsyncRequest:

tests/test_atproto_client/client/test_base.py

@@ -0,0 +1,11 @@
+from atproto_client.client.base import _BASE_API_URL, _handle_base_url
+
+
+def test_handle_base_url() -> None:
+    service_url = 'https://example.com/xrpc'
+
+    assert _handle_base_url() == _BASE_API_URL
+    assert _handle_base_url(None) == _BASE_API_URL
+    assert _handle_base_url('https://example.com') == service_url
+    assert _handle_base_url('https://example.com/') == service_url
+    assert _handle_base_url('https://example.com/xrpc') == service_url