axiomhq · bahlo · Sep 9, 2024 · Sep 8, 2024 · Sep 8, 2024 · Sep 8, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,10 +10,6 @@ on:
     tags:
       - "v*"
 
-env:
-  PYTHON_VERSION: "3.8"
-  POETRY_VERSION: "1.5"
-
 jobs:
   lint:
     name: Lint
@@ -53,9 +49,9 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
-      - run: pip install poetry==${{ env.POETRY_VERSION }}
-      - run: poetry install
-      - run: poetry run python -m pytest
+      - name: Install uv
+        uses: astral-sh/setup-uv@v2
+      - run: uv run pytest
         env:
           AXIOM_URL: ${{ secrets[matrix.url] }}
           AXIOM_TOKEN: ${{ secrets[matrix.token] }}
@@ -69,8 +65,13 @@ jobs:
       - test-integration
     steps:
       - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v2
       - uses: actions/setup-python@v5
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      - run: pip install poetry==${{ env.POETRY_VERSION }}
-      - run: poetry publish --build -u __token__ -p "${{ secrets.PYPI_TOKEN }}"
+          python-version-file: "pyproject.toml"
+      - run: uv build
+      - run: uvx twine upload dist/*
+        env:
+          TWINE_USERNAME: "__token__"
+          TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
diff --git a/.gitignore b/.gitignore
@@ -140,3 +140,6 @@ poetry.lock
 # Direnv
 /.envrc
 /.direnv
+
+# UV lockfiles
+uv.lock
diff --git a/README.md b/README.md
@@ -49,19 +49,19 @@ Otherwise create a personal token in [the Axiom settings](https://cloud.axiom.co
 You can also configure the client using options passed to the client constructor:
 
 ```py
-import axiom
+import axiom_py
 
-client = axiom.Client("<api token>", "<org id>")
+client = axiom_py.Client("<api token>", "<org id>")
 ```
 
 Create and use a client like this:
 
 ```py
-import axiom
+import axiom_py
 import rfc3339
 from datetime import datetime,timedelta
 
-client = axiom.Client()
+client = axiom_py.Client()
 
 time = datetime.utcnow() - timedelta(hours=1)
 time_formatted = rfc3339.format(time)
@@ -75,15 +75,12 @@ client.ingest_events(
 client.query(r"['my-dataset'] | where foo == 'bar' | limit 100")
 ```
 
-for more examples, check out the [examples](examples) directory.
+for more examples, check out `examples.py`.
 
 ## Contributing
 
-This project uses [Poetry](https://python-poetry.org) for dependecy management
-and packaging, so make sure that this is installed (see [Poetry Installation](https://python-poetry.org/docs/#installation)).
-
-Run `poetry install` to install dependencies and `poetry shell` to activate a
-virtual environment.
+This project uses [uv](https://docs.astral.sh/uv) for dependency management
+and packaging, so make sure that this is installed.
 
 ## License
 

diff --git a/examples.py b/examples.py
@@ -0,0 +1,31 @@
+from axiom_py import Client, DatasetCreateRequest
+
+
+def main():
+    client = Client()
+    dataset_name = "my-dataset"
+
+    # List datasets
+    res = client.datasets.get_list()
+    for dataset in res:
+        print(dataset.name)
+
+    # Create a dataset
+    client.datasets.create(
+        DatasetCreateRequest(name=dataset_name, description="A description.")
+    )
+
+    # Ingest events
+    client.ingest_events(dataset_name, [{"foo": "bar"}])
+
+    # Query events
+    res = client.query(f"['{dataset_name}'] | where status == 500")
+    for match in res.matches:
+        print(match.data)
+
+    # Delete the dataset
+    client.datasets.delete(dataset_name)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/examples/README.md b/examples/README.md
diff --git a/examples/create_dataset.py b/examples/create_dataset.py
diff --git a/examples/delete_dataset.py b/examples/delete_dataset.py
diff --git a/examples/ingest.py b/examples/ingest.py
diff --git a/examples/list_datasets.py b/examples/list_datasets.py
diff --git a/examples/main.py b/examples/main.py
diff --git a/examples/pyproject.toml b/examples/pyproject.toml
diff --git a/examples/query.py b/examples/query.py
diff --git a/examples/query_legacy.py b/examples/query_legacy.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,34 +1,36 @@
-[tool.poetry]
+[project]
 name = "axiom-py"
 version = "0.5.0"
-description = "Axiom API Python bindings."
-authors = ["Axiom, Inc."]
-license = "MIT"
-packages = [
-	{ include = "axiom" },
+description = "Official bindings for the Axiom API"
+readme = "README.md"
+requires-python = ">=3.8"
+dependencies = [
+    "requests>=2.32.3",
+    "requests-toolbelt>=1.0.0",
+    "ujson>=5.10.0",
+    "dacite>=1.8.1",
+    "pyhumps>=3.8.0",
+    "ndjson>=0.3.1",
 ]
+license = { file = "LICENSE" }
 
-[tool.poetry.dependencies]
-# urllib 3 has a breaking change in 2.0.0
-urllib3 = "<3.0.0"
-python = "^3.8"
-requests = "^2.30.0"
-requests-toolbelt = ">= 0.9.1, <1.1.0"
-ujson = "^5.2.0"
-dacite = "^1.6.0"
-pyhumps = ">=1.6.1,<4.0.0"
-ndjson = "^0.3.1"
-rfc3339 = "^6.2"
-iso8601 = ">=1.0.2,<3.0.0"
-
-[tool.poetry.dev-dependencies]
-pytest = "^8.2.1"
-responses = "^0.25.0"
-ruff = "^0.6.4"
+[project.urls]
+Homepage = "https://axiom.co"
+Repository = "https://github.com/axiomhq/axiom-py.git"
+Issues = "https://github.com/axiomhq/axiom-py/issues"
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [tool.ruff]
 line-length = 79 # PEP 8
+
+[tool.uv]
+dev-dependencies = [
+    "ruff>=0.6.4",
+    "pytest>=8.3.2",
+    "responses>=0.25.3",
+    "rfc3339>=6.2",
+    "iso8601>=1.0.2",
+]
diff --git a/axiom/__init__.py → src/axiom_py/__init__.py b/axiom/__init__.py → src/axiom_py/__init__.py
diff --git a/axiom/annotations.py → src/axiom_py/annotations.py b/axiom/annotations.py → src/axiom_py/annotations.py
diff --git a/axiom/client.py → src/axiom_py/client.py b/axiom/client.py → src/axiom_py/client.py
diff --git a/axiom/datasets.py → src/axiom_py/datasets.py b/axiom/datasets.py → src/axiom_py/datasets.py
diff --git a/axiom/logging.py → src/axiom_py/logging.py b/axiom/logging.py → src/axiom_py/logging.py
diff --git a/axiom/query/__init__.py → src/axiom_py/query/__init__.py b/axiom/query/__init__.py → src/axiom_py/query/__init__.py
diff --git a/axiom/query/aggregation.py → src/axiom_py/query/aggregation.py b/axiom/query/aggregation.py → src/axiom_py/query/aggregation.py
diff --git a/axiom/query/filter.py → src/axiom_py/query/filter.py b/axiom/query/filter.py → src/axiom_py/query/filter.py
diff --git a/axiom/query/options.py → src/axiom_py/query/options.py b/axiom/query/options.py → src/axiom_py/query/options.py
diff --git a/axiom/query/query.py → src/axiom_py/query/query.py b/axiom/query/query.py → src/axiom_py/query/query.py
diff --git a/axiom/query/result.py → src/axiom_py/query/result.py b/axiom/query/result.py → src/axiom_py/query/result.py
diff --git a/axiom/users.py → src/axiom_py/users.py b/axiom/users.py → src/axiom_py/users.py
diff --git a/axiom/util.py → src/axiom_py/util.py b/axiom/util.py → src/axiom_py/util.py
diff --git a/axiom/version.py → src/axiom_py/version.py b/axiom/version.py → src/axiom_py/version.py
diff --git a/tests/test_annotations.py b/tests/test_annotations.py
@@ -5,7 +5,7 @@
 import unittest
 from logging import getLogger
 from .helpers import get_random_name
-from axiom import (
+from axiom_py import (
     Client,
     DatasetCreateRequest,
     AnnotationCreateRequest,

diff --git a/tests/test_client.py b/tests/test_client.py
@@ -10,7 +10,7 @@
 from datetime import datetime, timedelta
 from .helpers import get_random_name
 from requests.exceptions import HTTPError
-from axiom import (
+from axiom_py import (
     Client,
     AplOptions,
     AplResultFormat,
@@ -20,7 +20,7 @@
     WrongQueryKindException,
     DatasetCreateRequest,
 )
-from axiom.query import (
+from axiom_py.query import (
     QueryLegacy,
     QueryOptions,
     QueryKind,

diff --git a/tests/test_datasets.py b/tests/test_datasets.py
@@ -8,7 +8,7 @@
 from requests.exceptions import HTTPError
 from datetime import timedelta
 from .helpers import get_random_name
-from axiom import (
+from axiom_py import (
     Client,
     DatasetCreateRequest,
     DatasetUpdateRequest,

diff --git a/tests/test_logger.py b/tests/test_logger.py
@@ -4,8 +4,8 @@
 import logging
 import unittest
 from .helpers import get_random_name
-from axiom import Client, DatasetCreateRequest
-from axiom.logging import AxiomHandler
+from axiom_py import Client, DatasetCreateRequest
+from axiom_py.logging import AxiomHandler
 
 
 class TestLogger(unittest.TestCase):