Update #349
Open
Update #349
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # pyasic/device/models.py # pyasic/miners/antminer/bmminer/X21/S21.py # pyasic/miners/antminer/bmminer/X21/__init__.py # pyasic/miners/backends/antminer.py # pyasic/miners/device/models/antminer/X21/S21.py # pyasic/miners/device/models/antminer/X21/__init__.py # pyproject.toml
b-rowan
requested changes
Jun 18, 2025
mkdocs.yml
Outdated
pyasic/__init__.py
Outdated
pyasic/data/__init__.py
Outdated
There was a problem hiding this comment.
Revert.
Regarding the is_sleep parameter, that should be parsed as part of the config and/or is_mining, config.mining_mode = MiningModeSleep() in this case.
| """ | ||
|
|
||
| speed: int = None | ||
| max_speed: Optional[int] = None |
There was a problem hiding this comment.
I prefer to use int | None here, I will update the supported versions to >=3.10 to guarantee support for this.
Comment on lines
15
to
46
| class PoolUrl(BaseModel): | ||
| scheme: Scheme | ||
| host: str | ||
| port: int | ||
| port: Optional[int] = None | ||
| pubkey: Optional[str] = None | ||
|
|
||
| @model_serializer | ||
| def serialize(self): | ||
| return str(self) | ||
|
|
||
| def __str__(self) -> str: | ||
| port_str = f":{self.port}" if self.port is not None else "" | ||
| if self.scheme == Scheme.STRATUM_V2 and self.pubkey: | ||
| return f"{self.scheme.value}://{self.host}:{self.port}/{self.pubkey}" | ||
| return f"{self.scheme.value}://{self.host}{port_str}/{self.pubkey}" | ||
| else: | ||
| return f"{self.scheme.value}://{self.host}:{self.port}" | ||
| return f"{self.scheme.value}://{self.host}{port_str}" | ||
|
|
||
| @classmethod | ||
| def from_str(cls, url: str) -> Self | None: | ||
| parsed_url = urlparse(url) | ||
| if not parsed_url.hostname: | ||
| return None | ||
| if not parsed_url.scheme.strip() == "": | ||
| scheme = Scheme(parsed_url.scheme) | ||
| else: | ||
| scheme = Scheme.STRATUM_V1 | ||
| # Если схема отсутствует, используем схему по умолчанию | ||
| scheme = ( | ||
| Scheme(parsed_url.scheme) | ||
| if parsed_url.scheme.strip() != "" | ||
| else Scheme.STRATUM_V1 | ||
| ) | ||
| host = parsed_url.hostname | ||
| port = parsed_url.port | ||
| port = parsed_url.port # может быть None, если порт не указан | ||
| pubkey = parsed_url.path.lstrip("/") if scheme == Scheme.STRATUM_V2 else None | ||
| return cls(scheme=scheme, host=host, port=port, pubkey=pubkey) |
There was a problem hiding this comment.
I may end up just replacing this with a pydantic type, learned recently that this is actually fully supported, so rather than this I can just use PoolUrl = Annotated[Url, UrlConstraints(host_required=True, allowed_schemes=["stratum+tcp", "stratum2+tcp", "stratum+ssl"])].
tests/test_data.py
Outdated
for more information, see https://pre-commit.ci
# Conflicts: # pyasic/test.py
for more information, see https://pre-commit.ci
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.