uncurl-httpx 0.1.0__tar.gz → 0.1.2__tar.gz

{uncurl_httpx-0.1.0/uncurl_httpx.egg-info → uncurl_httpx-0.1.2}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: uncurl-httpx
-Version: 0.1.0
+Version: 0.1.2
 Summary: uncurl for httpx, fork from uncurl-requests
 Author-email: cyliu <liucy1983@gmail.com>
 Project-URL: Homepage, https://github.com/liucy1983/uncurl-httpx
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.28.0
+Requires-Dist: httpx>=0.28.1
 Requires-Dist: pyperclip>=1.9.0
 Provides-Extra: dev
 Requires-Dist: pytest>=9.0.3; extra == "dev"
@@ -59,7 +59,10 @@ The underlying API:
 ```python
 import uncurl
 
-print(uncurl.parse("curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"))
+parsed = uncurl.parse(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+print(parsed.headers)
 ```
 
 如果你想直接发起请求，也可以调用：
@@ -74,24 +77,54 @@ response = uncurl.request(
 print(response.status_code)
 ```
 
-prints the string
+If you want the generated `httpx` code string, ask explicitly:
+
+```python
+import uncurl
+
+print(
+    uncurl.parse(
+        "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'",
+        as_object=False,
+    )
+)
+```
+
+This prints:
 
 ```bash
-'httpx.get("https://pypi.python.org/pypi/uncurl-httpx", headers={
+httpx.get("https://pypi.python.org/pypi/uncurl-httpx", headers={
     "Accept-Encoding": "gzip,deflate,sdch",
-})'
+})
 ```
 
 You can also retrieve the components as python objects:
 
 ```python
->>> import uncurl
->>> context = uncurl.parse_context("curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'")
->>> context.url
-https://pypi.python.org/pypi/uncurl-httpx
->>> context.headers
-OrderedDict([('Accept-Encoding', 'gzip,deflate,sdch')])
+import uncurl
+
+context = uncurl.parse_context(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+print(context.url)
+print(context.headers)
+```
+
+`parse()` already returns a mutable object by default, so you can tweak and send it directly:
+
+```python
+import uncurl
+
+parsed = uncurl.parse(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+parsed.url = "https://example.com/api"
+parsed.headers["X-Debug"] = "1"
+
+response = parsed.request(timeout=5.0)
+print(response.status_code)
 ```
+
 On Mac OS, you can also pipe input to uncurl:
 
 ```bash
@@ -101,5 +134,57 @@ pbpaste | uncurl
 ## Install
 
 ```console
-$ pip install uncurl
+$ pip install uncurl-httpx
+```
+
+## Release to PyPI with GitHub Actions
+
+This repository includes `.github/workflows/publish.yml` for automated releases. However, if GitHub Actions is disabled on your account, you can publish manually.
+
+## Manual Release to PyPI
+
+Create a local `.env` file at the project root:
+
+```dotenv
+PYPI_TOKEN=pypi-your-token-from-pypi-org
+```
+
+Then run:
+
+```bash
+make publish
+```
+
+Or directly:
+
+```bash
+uv run python scripts/publish.py
+```
+
+The script will:
+1. Run tests
+2. Build distributions
+3. Check with `twine`
+4. Upload to PyPI
+
+After upload completes, the new version will appear on [PyPI](https://pypi.org/project/uncurl-httpx/).
+
+## Automated Release with GitHub Actions
+
+This repository includes `.github/workflows/publish.yml`.
+Pushing a tag like `v0.1.1` will:
+
+1. run the test suite,
+2. build the package,
+3. validate the built artifacts with `twine check`,
+4. publish to PyPI.
+
+Before using it, configure a PyPI Trusted Publisher for this GitHub repository and workflow.
+
+Create and push a release tag with:
+
+```bash
+git tag v0.1.1
+git push origin v0.1.1
 ```
+

{uncurl_httpx-0.1.0 → uncurl_httpx-0.1.2}/README.md

@@ -42,7 +42,10 @@ The underlying API:
 ```python
 import uncurl
 
-print(uncurl.parse("curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"))
+parsed = uncurl.parse(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+print(parsed.headers)
 ```
 
 如果你想直接发起请求，也可以调用：
@@ -57,24 +60,54 @@ response = uncurl.request(
 print(response.status_code)
 ```
 
-prints the string
+If you want the generated `httpx` code string, ask explicitly:
+
+```python
+import uncurl
+
+print(
+    uncurl.parse(
+        "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'",
+        as_object=False,
+    )
+)
+```
+
+This prints:
 
 ```bash
-'httpx.get("https://pypi.python.org/pypi/uncurl-httpx", headers={
+httpx.get("https://pypi.python.org/pypi/uncurl-httpx", headers={
     "Accept-Encoding": "gzip,deflate,sdch",
-})'
+})
 ```
 
 You can also retrieve the components as python objects:
 
 ```python
->>> import uncurl
->>> context = uncurl.parse_context("curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'")
->>> context.url
-https://pypi.python.org/pypi/uncurl-httpx
->>> context.headers
-OrderedDict([('Accept-Encoding', 'gzip,deflate,sdch')])
+import uncurl
+
+context = uncurl.parse_context(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+print(context.url)
+print(context.headers)
+```
+
+`parse()` already returns a mutable object by default, so you can tweak and send it directly:
+
+```python
+import uncurl
+
+parsed = uncurl.parse(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+parsed.url = "https://example.com/api"
+parsed.headers["X-Debug"] = "1"
+
+response = parsed.request(timeout=5.0)
+print(response.status_code)
 ```
+
 On Mac OS, you can also pipe input to uncurl:
 
 ```bash
@@ -84,5 +117,57 @@ pbpaste | uncurl
 ## Install
 
 ```console
-$ pip install uncurl
+$ pip install uncurl-httpx
+```
+
+## Release to PyPI with GitHub Actions
+
+This repository includes `.github/workflows/publish.yml` for automated releases. However, if GitHub Actions is disabled on your account, you can publish manually.
+
+## Manual Release to PyPI
+
+Create a local `.env` file at the project root:
+
+```dotenv
+PYPI_TOKEN=pypi-your-token-from-pypi-org
+```
+
+Then run:
+
+```bash
+make publish
+```
+
+Or directly:
+
+```bash
+uv run python scripts/publish.py
+```
+
+The script will:
+1. Run tests
+2. Build distributions
+3. Check with `twine`
+4. Upload to PyPI
+
+After upload completes, the new version will appear on [PyPI](https://pypi.org/project/uncurl-httpx/).
+
+## Automated Release with GitHub Actions
+
+This repository includes `.github/workflows/publish.yml`.
+Pushing a tag like `v0.1.1` will:
+
+1. run the test suite,
+2. build the package,
+3. validate the built artifacts with `twine check`,
+4. publish to PyPI.
+
+Before using it, configure a PyPI Trusted Publisher for this GitHub repository and workflow.
+
+Create and push a release tag with:
+
+```bash
+git tag v0.1.1
+git push origin v0.1.1
 ```
+

{uncurl_httpx-0.1.0 → uncurl_httpx-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "uncurl-httpx"
-version = "0.1.0"
+version = "0.1.2"
 description = "uncurl for httpx, fork from uncurl-requests"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -12,7 +12,7 @@ authors = [
     { name = "cyliu", email = "liucy1983@gmail.com" },
 ]
 dependencies = [
-    "httpx>=0.28.0",
+    "httpx>=0.28.1",
     "pyperclip>=1.9.0",
 ]
 

{uncurl_httpx-0.1.0 → uncurl_httpx-0.1.2}/tests/test_api.py

@@ -3,7 +3,7 @@ from unittest.mock import sentinel
 
 
 def assert_parse(command, expected, **kwargs):
-    assert uncurl.parse(command, **kwargs) == expected
+    assert uncurl.parse(command, as_object=False, **kwargs) == expected
 
 
 def test_request_executes_httpx_request(mocker=None):
@@ -30,6 +30,41 @@ def test_request_executes_httpx_request(mocker=None):
     )
 
 
+def test_parse_can_return_mutable_object():
+    parsed = uncurl.parse("curl 'https://pypi.python.org/pypi/uncurl-httpx'", as_object=True)
+
+    assert isinstance(parsed, uncurl.ParsedContext)
+    parsed.method = 'post'
+    parsed.data = 'patched'
+
+    assert parsed.to_code() == """httpx.post(\"https://pypi.python.org/pypi/uncurl-httpx\",
+    data='patched',
+)"""
+
+
+def test_parse_object_can_request():
+    from unittest.mock import patch
+
+    parsed = uncurl.parse(
+        "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'",
+        as_object=True,
+    )
+    parsed.url = 'https://example.com/override'
+
+    with patch("uncurl.api.httpx.request", return_value=sentinel.response) as request_mock:
+        response = parsed.request(timeout=1.0)
+
+    assert response is sentinel.response
+    request_mock.assert_called_once_with(
+        'get',
+        'https://example.com/override',
+        timeout=1.0,
+        headers={
+            'Accept-Encoding': 'gzip,deflate,sdch',
+        },
+    )
+
+
 def test_basic_get():
     assert_parse("curl 'https://pypi.python.org/pypi/uncurl-httpx'", """httpx.get("https://pypi.python.org/pypi/uncurl-httpx")"""
     )

uncurl_httpx-0.1.2/uncurl/__init__.py

@@ -0,0 +1,3 @@
+from .api import ParsedContext, parse, parse_context, request
+
+__all__ = ("ParsedContext", "parse", "parse_context", "request")

{uncurl_httpx-0.1.0 → uncurl_httpx-0.1.2}/uncurl/api.py

@@ -3,8 +3,10 @@ import argparse
 import json
 import re
 import shlex
-from collections import OrderedDict, namedtuple
+from collections import OrderedDict
+from dataclasses import dataclass, field
 from http.cookies import SimpleCookie
+from typing import Any, Optional, Tuple
 
 import httpx
 
@@ -26,7 +28,85 @@ parser.add_argument('-U', '--proxy-user', default='')
 
 BASE_INDENT = " " * 4
 
-ParsedContext = namedtuple('ParsedContext', ['method', 'url', 'data', 'headers', 'cookies', 'verify', 'auth', 'proxy'])
+
+@dataclass
+class ParsedContext:
+    method: str
+    url: str
+    data: Optional[str] = None
+    headers: OrderedDict = field(default_factory=OrderedDict)
+    cookies: OrderedDict = field(default_factory=OrderedDict)
+    verify: bool = False
+    auth: Tuple[str, ...] = ()
+    proxy: Any = field(default_factory=dict)
+
+    def build_request_kwargs(self, **kwargs):
+        request_kwargs = dict(kwargs)
+        if 'allow_redirects' in request_kwargs:
+            request_kwargs['follow_redirects'] = request_kwargs.pop('allow_redirects')
+
+        if self.data:
+            request_kwargs['data'] = self.data
+
+        if self.headers:
+            request_kwargs['headers'] = dict(self.headers)
+
+        if self.cookies:
+            request_kwargs['cookies'] = dict(self.cookies)
+
+        if self.auth:
+            request_kwargs['auth'] = self.auth
+
+        if self.proxy:
+            request_kwargs['proxy'] = self.proxy
+
+        if self.verify:
+            request_kwargs['verify'] = False
+
+        return request_kwargs
+
+    def to_code(self, **kwargs):
+        request_kwargs = []
+
+        for key, value in sorted(kwargs.items()):
+            if key == 'allow_redirects':
+                key = 'follow_redirects'
+            request_kwargs.append(format_request_arg(key, value))
+
+        if self.data:
+            request_kwargs.append(format_request_arg('data', self.data))
+
+        if self.headers:
+            request_kwargs.append(format_dict_arg('headers', self.headers))
+
+        if self.cookies:
+            request_kwargs.append(format_dict_arg('cookies', self.cookies))
+
+        if self.auth:
+            request_kwargs.append(format_request_arg('auth', self.auth))
+
+        if self.proxy:
+            request_kwargs.append(format_request_arg('proxy', self.proxy))
+
+        if self.verify:
+            request_kwargs.append(format_request_arg('verify', False, trailing_comma=False))
+
+        if not request_kwargs:
+            return "httpx.{method}({url})".format(
+                method=self.method,
+                url=json.dumps(self.url),
+            )
+
+        return """httpx.{method}({url},
+{request_kwargs}
+)""".format(
+            method=self.method,
+            url=json.dumps(self.url),
+            request_kwargs='\n'.join(request_kwargs),
+        )
+
+    def request(self, **kwargs):
+        return httpx.request(self.method, self.url, **self.build_request_kwargs(**kwargs))
 
 
 def normalize_newlines(multiline_text):
@@ -95,74 +175,18 @@ def parse_context(curl_command):
     )
 
 
-def parse(curl_command, **kargs):
+def parse(curl_command, as_object=True, **kwargs):
     parsed_context = parse_context(curl_command)
 
-    request_kargs = []
-    for key, value in sorted(kargs.items()):
-        if key == 'allow_redirects':
-            key = 'follow_redirects'
-        request_kargs.append(format_request_arg(key, value))
-
-    if parsed_context.data:
-        request_kargs.append(format_request_arg('data', parsed_context.data))
-
-    if parsed_context.headers:
-        request_kargs.append(format_dict_arg('headers', parsed_context.headers))
-
-    if parsed_context.cookies:
-        request_kargs.append(format_dict_arg('cookies', parsed_context.cookies))
-
-    if parsed_context.auth:
-        request_kargs.append(format_request_arg('auth', parsed_context.auth))
-
-    if parsed_context.proxy:
-        request_kargs.append(format_request_arg('proxy', parsed_context.proxy))
-
-    if parsed_context.verify:
-        request_kargs.append(format_request_arg('verify', False, trailing_comma=False))
-
-    if not request_kargs:
-        return "httpx.{method}({url})".format(
-            method=parsed_context.method,
-            url=json.dumps(parsed_context.url),
-        )
+    if as_object:
+        return parsed_context
 
-    return """httpx.{method}({url},
-{request_kargs}
-)""".format(
-        method=parsed_context.method,
-        url=json.dumps(parsed_context.url),
-        request_kargs='\n'.join(request_kargs),
-    )
+    return parsed_context.to_code(**kwargs)
 
 
 def request(curl_command, **kwargs):
     parsed_context = parse_context(curl_command)
-
-    request_kwargs = dict(kwargs)
-    if 'allow_redirects' in request_kwargs:
-        request_kwargs['follow_redirects'] = request_kwargs.pop('allow_redirects')
-
-    if parsed_context.data:
-        request_kwargs['data'] = parsed_context.data
-
-    if parsed_context.headers:
-        request_kwargs['headers'] = dict(parsed_context.headers)
-
-    if parsed_context.cookies:
-        request_kwargs['cookies'] = dict(parsed_context.cookies)
-
-    if parsed_context.auth:
-        request_kwargs['auth'] = parsed_context.auth
-
-    if parsed_context.proxy:
-        request_kwargs['proxy'] = parsed_context.proxy
-
-    if parsed_context.verify:
-        request_kwargs['verify'] = False
-
-    return httpx.request(parsed_context.method, parsed_context.url, **request_kwargs)
+    return parsed_context.request(**kwargs)
 
 
 def format_request_arg(key, value, trailing_comma=True):

{uncurl_httpx-0.1.0 → uncurl_httpx-0.1.2}/uncurl/bin.py

@@ -10,10 +10,10 @@ def main():
     if sys.stdin.isatty():
         if len(sys.argv) > 1:
             # If an argument is passed
-            result = parse(sys.argv[1])
+            result = parse(sys.argv[1], as_object=False)
         else:
             # Otherwise pull from clipboard
-            result = parse(pyperclip.paste())
+            result = parse(pyperclip.paste(), as_object=False)
     else:
-        result = parse(sys.stdin.read())
+        result = parse(sys.stdin.read(), as_object=False)
     print("\n" + result)

{uncurl_httpx-0.1.0 → uncurl_httpx-0.1.2/uncurl_httpx.egg-info}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: uncurl-httpx
-Version: 0.1.0
+Version: 0.1.2
 Summary: uncurl for httpx, fork from uncurl-requests
 Author-email: cyliu <liucy1983@gmail.com>
 Project-URL: Homepage, https://github.com/liucy1983/uncurl-httpx
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.28.0
+Requires-Dist: httpx>=0.28.1
 Requires-Dist: pyperclip>=1.9.0
 Provides-Extra: dev
 Requires-Dist: pytest>=9.0.3; extra == "dev"
@@ -59,7 +59,10 @@ The underlying API:
 ```python
 import uncurl
 
-print(uncurl.parse("curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"))
+parsed = uncurl.parse(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+print(parsed.headers)
 ```
 
 如果你想直接发起请求，也可以调用：
@@ -74,24 +77,54 @@ response = uncurl.request(
 print(response.status_code)
 ```
 
-prints the string
+If you want the generated `httpx` code string, ask explicitly:
+
+```python
+import uncurl
+
+print(
+    uncurl.parse(
+        "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'",
+        as_object=False,
+    )
+)
+```
+
+This prints:
 
 ```bash
-'httpx.get("https://pypi.python.org/pypi/uncurl-httpx", headers={
+httpx.get("https://pypi.python.org/pypi/uncurl-httpx", headers={
     "Accept-Encoding": "gzip,deflate,sdch",
-})'
+})
 ```
 
 You can also retrieve the components as python objects:
 
 ```python
->>> import uncurl
->>> context = uncurl.parse_context("curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'")
->>> context.url
-https://pypi.python.org/pypi/uncurl-httpx
->>> context.headers
-OrderedDict([('Accept-Encoding', 'gzip,deflate,sdch')])
+import uncurl
+
+context = uncurl.parse_context(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+print(context.url)
+print(context.headers)
+```
+
+`parse()` already returns a mutable object by default, so you can tweak and send it directly:
+
+```python
+import uncurl
+
+parsed = uncurl.parse(
+    "curl 'https://pypi.python.org/pypi/uncurl-httpx' -H 'Accept-Encoding: gzip,deflate,sdch'"
+)
+parsed.url = "https://example.com/api"
+parsed.headers["X-Debug"] = "1"
+
+response = parsed.request(timeout=5.0)
+print(response.status_code)
 ```
+
 On Mac OS, you can also pipe input to uncurl:
 
 ```bash
@@ -101,5 +134,57 @@ pbpaste | uncurl
 ## Install
 
 ```console
-$ pip install uncurl
+$ pip install uncurl-httpx
+```
+
+## Release to PyPI with GitHub Actions
+
+This repository includes `.github/workflows/publish.yml` for automated releases. However, if GitHub Actions is disabled on your account, you can publish manually.
+
+## Manual Release to PyPI
+
+Create a local `.env` file at the project root:
+
+```dotenv
+PYPI_TOKEN=pypi-your-token-from-pypi-org
+```
+
+Then run:
+
+```bash
+make publish
+```
+
+Or directly:
+
+```bash
+uv run python scripts/publish.py
+```
+
+The script will:
+1. Run tests
+2. Build distributions
+3. Check with `twine`
+4. Upload to PyPI
+
+After upload completes, the new version will appear on [PyPI](https://pypi.org/project/uncurl-httpx/).
+
+## Automated Release with GitHub Actions
+
+This repository includes `.github/workflows/publish.yml`.
+Pushing a tag like `v0.1.1` will:
+
+1. run the test suite,
+2. build the package,
+3. validate the built artifacts with `twine check`,
+4. publish to PyPI.
+
+Before using it, configure a PyPI Trusted Publisher for this GitHub repository and workflow.
+
+Create and push a release tag with:
+
+```bash
+git tag v0.1.1
+git push origin v0.1.1
 ```
+

{uncurl_httpx-0.1.0 → uncurl_httpx-0.1.2}/uncurl_httpx.egg-info/requires.txt

@@ -1,4 +1,4 @@
-httpx>=0.28.0
+httpx>=0.28.1
 pyperclip>=1.9.0
 
 [dev]

uncurl_httpx-0.1.0/uncurl/__init__.py

@@ -1,3 +0,0 @@
-from .api import parse, parse_context, request
-
-__all__ = ("parse", "parse_context", "request")