Skip to content

Commit 01ad7c1

Browse files
committed
new versions gslib and tagpacktool
1 parent c44f996 commit 01ad7c1

File tree

6 files changed

+117
-481
lines changed

6 files changed

+117
-481
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ all: format lint
22

33
-include .env
44

5-
GS_REST_SERVICE_VERSIONM ?= "25.07.0"
6-
GS_REST_SERVICE_VERSION ?= "1.12.0"
5+
GS_REST_SERVICE_VERSIONM ?= "25.08.0dev1"
6+
GS_REST_SERVICE_VERSION ?= "1.13.0"
77
GS_REST_DEV_PORT ?= 9000
88
NUM_WORKERS ?= 1
99
NUM_THREADS ?= 1

gsrest/db/cassandra.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
ExecutionProfile,
1919
NoHostAvailable,
2020
)
21+
from cassandra.auth import PlainTextAuthProvider
2122
from cassandra.policies import DCAwareRoundRobinPolicy, TokenAwarePolicy
2223
from cassandra.protocol import ProtocolException
2324
from cassandra.query import SimpleStatement, ValueSequence, dict_factory
@@ -497,12 +498,21 @@ def connect(self):
497498
load_balancing_policy=TokenAwarePolicy(DCAwareRoundRobinPolicy()),
498499
consistency_level=cl,
499500
)
501+
502+
auth_provider = None
503+
if "username" in self.config:
504+
auth_provider = PlainTextAuthProvider(
505+
username=self.config["username"],
506+
password=self.config.get("password", ""),
507+
)
508+
500509
self.cluster = Cluster(
501510
self.config["nodes"],
502511
port=int(self.config.get("port", 9042)),
503512
protocol_version=5,
504513
connect_timeout=60,
505514
execution_profiles={EXEC_PROFILE_DEFAULT: exec_prof},
515+
auth_provider=auth_provider,
506516
)
507517
self.session = self.cluster.connect()
508518
# self.session.row_factory = dict_factory

openapi_server/openapi/openapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ info:
55
name: Iknaio Cryptoasset Analytics GmbH
66
description: GraphSense API provides programmatic access to various ledgers' addresses, entities, blocks, transactions and tags for automated and highly efficient forensics tasks.
77
title: GraphSense API
8-
version: 1.12.0
8+
version: 1.13.0
99
servers:
1010
- url: https://api.ikna.io
1111
paths:

openapi_spec/graphsense.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ info:
55
contact:
66
name: Iknaio Cryptoasset Analytics GmbH
77
email: contact@ikna.io
8-
version: "1.12.0"
8+
version: "1.13.0"
99
servers:
1010
- url: 'https://api.ikna.io'
1111
paths:

pyproject.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "gsrest"
3-
version = "1.12.0"
3+
version = "1.13.0"
44
description = "GraphSense API REST API"
55
readme = "README.md"
66
changelog = "CHANGELOG.md"
@@ -18,13 +18,13 @@ dependencies = [
1818
"aiohttp-jinja2>=1.5.0",
1919
"async-lru>=2.0.4",
2020
"cassandra-driver>=3.27.0",
21-
"connexion[swagger-ui]>=2.6.0,<3.0",
22-
"graphsense-lib[swaps]",
21+
"connexion[swagger-ui]>=2.6.0",
22+
"graphsense-lib>=2.5.0",
2323
"lz4>=4.3.2",
2424
"openapi-schema-validator>=0.2.3",
2525
"python-dateutil>=2.9.0",
2626
"swagger-ui-bundle>=0.0.9",
27-
"tagpack-tool>=25.7.5",
27+
"tagpack-tool>=25.7.7",
2828
]
2929

3030

@@ -72,9 +72,6 @@ exclude = [
7272
[tool.ruff.lint]
7373
extend-select = ["T201"]
7474

75-
[tool.uv.sources]
76-
graphsense-lib = { git = "https://github.com/graphsense/graphsense-lib", branch = "feature/swaps" }
77-
7875
[dependency-groups]
7976
dev = [
8077
"aiohttp-devtools>=1.1.2",

0 commit comments

Comments
 (0)