Skip to content

chore: switch back to sqlite3 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alissonlauffer wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

chore: switch back to sqlite3 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

intersphinx_mapping = {
"python": ("https://docs.python.org/3", None),
"aiosqlite": ("https://aiosqlite.omnilib.dev/en/stable/", None),
}

html_use_modindex = False
Expand Down
1 change: 0 additions & 1 deletion docs/source/hydrogram-vs-pyrogram.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Key changes
- Completely refactored, optimized and modernized codebase (utilizing Ruff)
- Open-source documentation
- Adopt modern packaging technologies and standards, such as pyproject.toml
- Use aiosqlite instead of sqlite3 for storage handling.
- Added the property `full_name` for User and Chat objects.
- Added the possibility to define a custom storage class

Expand Down
63 changes: 31 additions & 32 deletions hydrogram/storage/sqlite_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@

import base64
import logging
import sqlite3
import struct
import time
from pathlib import Path
from typing import Any

import aiosqlite

from hydrogram import raw, utils

from .base import BaseStorage, InputPeer
Expand Down Expand Up @@ -105,7 +104,7 @@ def __init__(
else (workdir / (self.name + self.FILE_EXTENSION) if workdir else ":memory:")
)
self.session_string: str | None = session_string
self.conn: aiosqlite.Connection | None = None
self.conn: sqlite3.Connection | None = None

async def update(self) -> None:
if not self.conn:
Expand All @@ -115,47 +114,47 @@ async def update(self) -> None:
version: int | None = await self.version()

if version == 1:
await self.conn.execute("DELETE FROM peers")
self.conn.execute("DELETE FROM peers")
version += 1

if version == 2:
await self.conn.execute("ALTER TABLE sessions ADD api_id INTEGER")
self.conn.execute("ALTER TABLE sessions ADD api_id INTEGER")
version += 1

await self.version(version)
await self.conn.commit()
self.conn.commit()

async def create(self) -> None:
if not self.conn:
logging.warning("Database connection is not available.")
return

await self.conn.executescript(SCHEMA)
await self.conn.execute(
self.conn.executescript(SCHEMA)
self.conn.execute(
"INSERT INTO version VALUES (?)",
(self.VERSION,),
)
await self.conn.execute(
self.conn.execute(
"INSERT INTO sessions VALUES (?, ?, ?, ?, ?, ?, ?)",
(2, None, None, None, 0, None, None),
)
await self.conn.commit()
self.conn.commit()

async def open(self) -> None:
path = self.database
file_exists = isinstance(path, Path) and path.is_file()

self.conn = await aiosqlite.connect(self.database)
self.conn = sqlite3.connect(self.database)

await self.conn.execute("PRAGMA journal_mode=WAL")
self.conn.execute("PRAGMA journal_mode=WAL")

if file_exists:
await self.update()
await self.conn.execute("VACUUM")
self.conn.execute("VACUUM")
else:
await self.create()

await self.conn.commit()
self.conn.commit()

if self.session_string:
await self._load_session_string()
Expand Down Expand Up @@ -187,11 +186,11 @@ async def save(self) -> None:
return

await self.date(int(time.time()))
await self.conn.commit()
self.conn.commit()

async def close(self) -> None:
if self.conn:
await self.conn.close()
self.conn.close()

async def delete(self) -> None:
if self.database != ":memory:":
Expand All @@ -204,22 +203,22 @@ async def update_peers(
logging.warning("Database connection is not available.")
return

await self.conn.executemany(
self.conn.executemany(
"REPLACE INTO peers (id, access_hash, type, username, phone_number) "
"VALUES (?, ?, ?, ?, ?)",
peers,
)
await self.conn.commit()
self.conn.commit()

async def get_peer_by_id(self, peer_id: int) -> InputPeer | None:
if not self.conn:
logging.warning("Database connection is not available.")
return None

q = await self.conn.execute(
q = self.conn.execute(
"SELECT id, access_hash, type FROM peers WHERE id = ?", (peer_id,)
)
r = await q.fetchone()
r = q.fetchone()
if not r:
raise KeyError(f"ID not found: {peer_id}")

Expand All @@ -230,14 +229,14 @@ async def get_peer_by_username(self, username: str) -> InputPeer | None:
logging.warning("Database connection is not available.")
return None

q = await self.conn.execute(
q = self.conn.execute(
"SELECT id, access_hash, type, last_update_on "
"FROM peers "
"WHERE username = ? "
"ORDER BY last_update_on DESC",
(username,),
)
r = await q.fetchone()
r = q.fetchone()
if not r:
raise KeyError(f"Username not found: {username}")

Expand All @@ -251,10 +250,10 @@ async def get_peer_by_phone_number(self, phone_number: str) -> InputPeer | None:
logging.warning("Database connection is not available.")
return None

q = await self.conn.execute(
q = self.conn.execute(
"SELECT id, access_hash, type FROM peers WHERE phone_number = ?", (phone_number,)
)
r = await q.fetchone()
r = q.fetchone()
if not r:
raise KeyError(f"Phone number not found: {phone_number}")

Expand All @@ -265,17 +264,17 @@ async def _get(self, attr: str) -> Any:
logging.warning("Database connection is not available.")
return None

q = await self.conn.execute(f"SELECT {attr} FROM sessions")
row = await q.fetchone()
q = self.conn.execute(f"SELECT {attr} FROM sessions")
row = q.fetchone()
return row[0] if row else None

async def _set(self, attr: str, value: Any) -> None:
if not self.conn:
logging.warning("Database connection is not available.")
return

await self.conn.execute(f"UPDATE sessions SET {attr} = ?", (value,))
await self.conn.commit()
self.conn.execute(f"UPDATE sessions SET {attr} = ?", (value,))
self.conn.commit()

async def _accessor(self, attr: str, value: Any = object) -> Any | None:
if not self.conn:
Expand Down Expand Up @@ -315,10 +314,10 @@ async def version(self, value: int | object = object) -> int | None:
return None

if value is object:
q = await self.conn.execute("SELECT number FROM version")
row = await q.fetchone()
q = self.conn.execute("SELECT number FROM version")
row = q.fetchone()
return row[0] if row else None

await self.conn.execute("UPDATE version SET number = ?", (value,))
await self.conn.commit()
self.conn.execute("UPDATE version SET number = ?", (value,))
self.conn.commit()
return None
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "Hydrogram"
dynamic = ["version"]
description = "Sleek, advanced, and asynchronous Telegram MTProto API framework in Python, designed for fluid user and bot interactions."
authors = [{ name = "Hydrogram", email = "contact@hydrogram.org" }]
dependencies = ["pyaes==1.6.1", "pysocks==1.7.1", "aiosqlite>=0.19.0"]
dependencies = ["pyaes==1.6.1", "pysocks==1.7.1"]
readme = "README.md"
license = "LGPL-3.0-or-later"
requires-python = ">=3.9"
Expand Down