fixes

.gitignore

@@ -127,3 +127,5 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+*.dnc.py

.python-version

@@ -0,0 +1 @@
+3.10.14

CHANGELOG.md

@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- N/A
+
+## [1.1.0]
+
 - Fixed cooldown time enforcing
+- Use seed comprised of username and SID when determining User Agent
 
 ## [1.0.1]
 
@@ -17,7 +22,5 @@ All notable changes to this project will be documented in this file.
 ### Initial Release
 
 [Unreleased]: https://github.com/joeyagreco/pythontextnow/compare/v1.0.1...HEAD
-
 [1.0.1]: https://github.com/joeyagreco/pythontextnow/releases/tag/v1.0.1
-
-[1.0.0]: https://github.com/joeyagreco/pythontextnow/releases/tag/v1.0.0
+[1.0.0]: https://github.com/joeyagreco/pythontextnow/releases/tag/v1.0.0

Makefile

@@ -1,20 +1,32 @@
-# INSTALL DEPENDENCIES
 .PHONY: deps
 deps:
-	@python3.10 -m pip install -r requirements.dev.txt
-	@python3.10 -m pip install -r requirements.txt
+	@python -m pip install -r requirements.dev.txt
+	@python -m pip install -r requirements.txt
 
-# FORMAT PYTHON CODE
 .PHONY: fmt
 fmt:
-	@black --config=pyproject.toml .
-	@autoflake --config=pyproject.toml .
-	@isort .
+	@ruff check --fix
+	@ruff format
+
+.PHONY: fmt-check
+fmt-check:
+	@ruff check
+	@ruff format --check
 
-# RUN UNIT TESTS
 .PHONY: test
 test:
 	@pytest
 
+.PHONY: pkg-build
+pkg-build:
+	@rm -rf build
+	@rm -rf dist
+	@python setup.py sdist bdist_wheel
 
+.PHONY: pkg-test
+pkg-test:
+	@python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 
+.PHONY: pkg-prod
+pkg-prod:
+	@python -m twine upload dist/*

pyproject.toml

@@ -1,15 +1,2 @@
-[tool.black]
-line-length = 100
-skip-magic-trailing-comma = true
-include = '\.py$'
-quiet = true
-
-[tool.isort]
-profile = "black"
-line_length = 100
-
-[autoflake]
-ignore_init_module_imports = true
-in_place = true
-recursive = true
-remove_all_unused_imports = true
+[tool.ruff.lint]
+select = [ "I001" ]

pythontextnow/_version.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.1.0"

pythontextnow/api/Client.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import datetime
+import hashlib
 from dataclasses import dataclass
 from typing import Optional
 
@@ -28,7 +29,15 @@ class Client:
 
     @classmethod
     def set_client_config(cls, *, username: str, sid_cookie: str) -> None:
-        headers = {"user-agent": get_random_user_agent(), "Cookie": f"connect.sid={sid_cookie};"}
+        # use the same user agent for the same username + sid cookie combo
+        # we do this by creating a hash of them and then using it as a seed
+        hash: int = int(
+            hashlib.sha256(f"{username}+{sid_cookie}".encode()).hexdigest(), 16
+        )
+        headers = {
+            "user-agent": get_random_user_agent(hash),
+            "Cookie": f"connect.sid={sid_cookie};",
+        }
 
         client_config = ClientConfig(
             username=username,

pythontextnow/util/general.py

@@ -1,4 +1,6 @@
+import random
 import re
+from typing import Optional
 
 from random_user_agent.params import OperatingSystem, SoftwareName
 from random_user_agent.user_agent import UserAgent
@@ -8,12 +10,14 @@ def replace_newlines(text: str):
     return re.sub(r"(?<!\\)\n", r"\\n", text)
 
 
-def get_random_user_agent() -> str:
+def get_random_user_agent(seed: Optional[int] = None) -> str:
     software_names = [SoftwareName.CHROME.value]
     operating_systems = [OperatingSystem.WINDOWS.value, OperatingSystem.LINUX.value]
     user_agent_rotator = UserAgent(
         software_names=software_names, operating_systems=operating_systems, limit=100
     )
 
-    # Get Random User Agent String.
-    return user_agent_rotator.get_random_user_agent()
+    if seed is not None:
+        random.seed(seed)
+
+    return random.choice(user_agent_rotator.get_user_agents())["user_agent"]

requirements.dev.txt

@@ -1,5 +1,4 @@
-black~=23.3.0
-autoflake~=2.1.1
-isort~=5.12.0
-pipreqs~=0.4.13
-pytest~=7.4.4
+wheel~=0.42.0
+pytest~=8.0.0
+twine~=5.1.1
+ruff~=0.5.7