Repository navigation
3. Банад Михаил Вячеславович. 614 #129
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.
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
phantom686
wants to merge
26
commits into
python-department:main
Choose a base branch
from
phantom686:task3
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
d7c88f3
Solve task 1
86c89c4
Solve task 1
7bab989
Solve task 1
c552b88
Update snowflake.py
phantom686 1e23410
Update constants.py
phantom686 3a6dc3d
Update snowflake.py
phantom686 edd79d8
Solve task 1
2c1f76f
jj
d173d13
Update snowflake.py
phantom686 d656349
Update snowflake.py
phantom686 ff338aa
Update snowflake.py
phantom686 bf59011
Update snowflake.py
phantom686 66427ec
jj
21da06c
Merge branch 'python-department:main' into task3
phantom686 1409ca9
fix
3a4c445
task3
08d9d76
fix
a95ff21
fixmypy
8e6d6ef
fix2
b7f46c3
fix3
d8b84c2
fix4
a0d126e
fix5
6e1116b
fix6
563e06e
fix7
23a9f6e
fix8
5842a47
finalfix
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,10 @@ | ||
| """Bit layout and default epoch for the Twitter Snowflake ID generator. | ||
|
|
||
| A Snowflake identifier is a 63-bit positive integer packed as follows, from | ||
| the most significant bit downwards: | ||
|
|
||
| 1 bit unused sign bit, always zero | ||
| 41 bits milliseconds elapsed since a custom epoch | ||
| 10 bits node identifier | ||
| 12 bits per-millisecond sequence counter | ||
|
|
||
| The shift and mask constants should be derived from the bit widths so that | ||
| changing a width keeps everything else consistent. | ||
| """ | ||
|
|
||
| from typing import Final | ||
|
|
||
|
|
||
| # TODO: замените заглушки (0) на корректные значения, см. TASK.md. | ||
| # Все константы, зависящие от ёмкостей *_BITS, должны вычисляться из них. | ||
|
|
||
| # Twitter's original Snowflake epoch: 2010-11-04 01:42:54.657 UTC. | ||
| EPOCH_MS_DEFAULT: Final[int] = 0 | ||
|
|
||
| # Node identifier used when the caller does not supply one. | ||
| NODE_ID_DEFAULT: Final[int] = 0 | ||
|
|
||
| # Width of each field, in bits. | ||
| TIMESTAMP_BITS: Final[int] = 0 | ||
| NODE_ID_BITS: Final[int] = 0 | ||
| SEQUENCE_ID_BITS: Final[int] = 0 | ||
|
|
||
| # Largest value each field can hold. | ||
| TIMESTAMP_MS_MAX: Final[int] = 0 | ||
| NODE_ID_MAX: Final[int] = 0 | ||
| SEQUENCE_ID_MAX: Final[int] = 0 | ||
|
|
||
| # Здесь можно добавить собственные вспомогательные константы | ||
| # (например, сдвиги полей при сборке идентификатора). | ||
| EPOCH_MS_DEFAULT: int = 1288834974657 | ||
| NODE_ID_DEFAULT: int = 1 | ||
| TIMESTAMP_BITS: int = 41 | ||
| NODE_ID_BITS: int = 10 | ||
| SEQUENCE_ID_BITS: int = 12 | ||
| TIMESTAMP_MS_MAX: int = 2**TIMESTAMP_BITS - 1 | ||
| NODE_ID_MAX: int = 2**NODE_ID_BITS - 1 | ||
| SEQUENCE_ID_MAX: int = 2**SEQUENCE_ID_BITS - 1 | ||
| NODE_ID_SHIFT: int = SEQUENCE_ID_BITS | ||
| TIMESTAMP_SHIFT: int = SEQUENCE_ID_BITS + NODE_ID_BITS |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,52 @@ | ||
| """Twitter Snowflake identifier generator. | ||
| import time | ||
|
|
||
| Snowflake produces roughly time-ordered 64-bit integer identifiers without | ||
| coordination between nodes. Each identifier packs the milliseconds elapsed | ||
| since a custom epoch, a node identifier and a per-millisecond sequence counter | ||
| into a single 63-bit positive integer (see ``constants`` for the layout). | ||
|
|
||
| The public entry point is :func:`generate_snowflake_id`. It is stateless: the | ||
| caller passes the sequence counter on every call and is responsible for | ||
| advancing it within a millisecond and resetting it when the clock ticks over. | ||
|
|
||
| Each packed field can be read back on its own with :func:`decode_timestamp_ms`, | ||
| :func:`decode_node_id` and :func:`decode_sequence_id`. | ||
| """ | ||
|
|
||
| import time # noqa: F401 | ||
|
|
||
| from .constants import ( # noqa: F401 | ||
| from .constants import ( | ||
| EPOCH_MS_DEFAULT, | ||
| NODE_ID_DEFAULT, | ||
| NODE_ID_MAX, | ||
| NODE_ID_SHIFT, | ||
| SEQUENCE_ID_MAX, | ||
| TIMESTAMP_MS_MAX, | ||
| TIMESTAMP_SHIFT, | ||
| ) | ||
|
|
||
|
|
||
| def read_current_millis(epoch_ms: int) -> int: | ||
| """Read the number of milliseconds elapsed since the custom epoch. | ||
|
|
||
| Args: | ||
| epoch_ms: The custom epoch expressed as Unix milliseconds. | ||
|
|
||
| Returns: | ||
| The count of whole milliseconds between ``epoch_ms`` and now. May be | ||
| negative if ``epoch_ms`` lies in the future. | ||
| """ | ||
| # TODO: реализуйте функцию | ||
| return 0 | ||
| return int(int(time.time() * 1000) - epoch_ms) | ||
|
|
||
|
|
||
| def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: | ||
| """Read the timestamp field out of a Snowflake identifier. | ||
|
|
||
| Args: | ||
| snowflake_id: An identifier produced against the same epoch. | ||
| epoch_ms: The epoch the identifier was generated against. Defaults to | ||
| the original Twitter epoch (2010-11-04 01:42:54.657 UTC). | ||
|
|
||
| Returns: | ||
| The absolute Unix time in milliseconds at which the identifier was | ||
| generated. | ||
| """ | ||
| # TODO: реализуйте функцию | ||
| return 0 | ||
| return int(snowflake_id // (2**TIMESTAMP_SHIFT) + epoch_ms) | ||
|
|
||
|
|
||
| def decode_node_id(snowflake_id: int) -> int: | ||
| """Read the node identifier field out of a Snowflake identifier. | ||
|
|
||
| Args: | ||
| snowflake_id: An identifier produced by :func:`generate_snowflake_id`. | ||
|
|
||
| Returns: | ||
| The node identifier packed into ``snowflake_id``, in the range | ||
| ``[0, NODE_ID_MAX]``. | ||
| """ | ||
| # TODO: реализуйте функцию | ||
| return 0 | ||
| def decode_node_id(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: | ||
| return int( | ||
| ( | ||
| snowflake_id | ||
| - ( | ||
| (decode_timestamp_ms(snowflake_id, epoch_ms) - epoch_ms) | ||
| * 2**TIMESTAMP_SHIFT | ||
| ) | ||
| ) | ||
| // (2**NODE_ID_SHIFT) | ||
| ) | ||
|
|
||
|
|
||
| def decode_sequence_id(snowflake_id: int) -> int: | ||
| """Read the sequence counter field out of a Snowflake identifier. | ||
|
|
||
| Args: | ||
| snowflake_id: An identifier produced by :func:`generate_snowflake_id`. | ||
|
|
||
| Returns: | ||
| The per-millisecond sequence counter packed into ``snowflake_id``, in | ||
| the range ``[0, SEQUENCE_ID_MAX]``. | ||
| """ | ||
| # TODO: реализуйте функцию | ||
| return 0 | ||
| return int(snowflake_id - ((snowflake_id // 2**NODE_ID_SHIFT) * (2**NODE_ID_SHIFT))) | ||
|
|
||
|
|
||
| def generate_snowflake_id( | ||
| sequence_id: int, | ||
| node_id: int = NODE_ID_DEFAULT, | ||
| epoch_ms: int = EPOCH_MS_DEFAULT, | ||
| sequence_id: int, node_id: int = NODE_ID_DEFAULT, epoch_ms: int = EPOCH_MS_DEFAULT | ||
| ) -> int | None: | ||
| """Build and return a Snowflake identifier for the current millisecond. | ||
|
|
||
| The function is stateless: the caller passes the per-millisecond sequence | ||
| counter explicitly. It is the caller's responsibility to increment | ||
| ``sequence_id`` for identifiers minted within the same millisecond and to | ||
| reset it once the clock advances. | ||
|
|
||
| Args: | ||
| sequence_id: The per-millisecond sequence counter, in the range | ||
| ``[0, SEQUENCE_ID_MAX]``. | ||
| node_id: The identifier of this node, in the range ``[0, NODE_ID_MAX]``. | ||
| Optional; defaults to ``NODE_ID_DEFAULT``. | ||
| epoch_ms: The start of the epoch as Unix milliseconds. Optional; | ||
| defaults to the original Twitter epoch (2010-11-04 01:42:54.657 | ||
| UTC). | ||
|
|
||
| Returns: | ||
| The Snowflake identifier as a positive 63-bit integer, or ``None`` if | ||
| ``node_id`` is outside ``[0, NODE_ID_MAX]``, ``sequence_id`` is outside | ||
| ``[0, SEQUENCE_ID_MAX]``, or the elapsed time no longer fits in the | ||
| timestamp field (roughly 69 years after ``epoch_ms``). In each of those | ||
| cases an explanatory message is printed to stdout first. | ||
| """ | ||
| # TODO: реализуйте функцию | ||
| return 0 | ||
| current_millis = read_current_millis(epoch_ms) | ||
| if current_millis < 0 or current_millis > TIMESTAMP_MS_MAX: | ||
| raise ValueError("Превышен максимальный лимит времени") | ||
| if node_id < 0 or node_id > NODE_ID_MAX: | ||
| raise ValueError("Node Id выходит за допустимые пределы") | ||
| if sequence_id < 0 or sequence_id > SEQUENCE_ID_MAX: | ||
| raise ValueError("Sequence Id выходит за допустимые пределы") | ||
| return int( | ||
| (current_millis * (2**TIMESTAMP_SHIFT)) | ||
| + (node_id * (2**NODE_ID_SHIFT) + sequence_id) | ||
| ) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,131 +1,79 @@ | ||
| """Create/read/update/delete operations over the in-memory product store. | ||
|
|
||
| Every operation takes the store -- a list of | ||
| :data:`~src.part3.storage.Product` tuples -- as its first argument and | ||
| works on it in place. The failure path never raises: the operation prints | ||
| an explanatory message to stdout and returns ``None``. | ||
|
|
||
| The identifier of a new product is derived from the store itself | ||
| (:func:`generate_product_id`): one past the greatest identifier in use, or | ||
| :data:`~src.part3.storage.PRODUCT_ID_MIN` when the store is empty. | ||
|
|
||
| Every product name that reaches the store is passed through | ||
| :func:`~src.part3.utils.normalize_product_name` first. A name that | ||
| normalises to an empty string is rejected -- the operation prints a | ||
| message and changes nothing. Names are also kept unique -- | ||
| :func:`create_product` refuses a normalised name that is already taken, | ||
| and :func:`update_product` refuses one that is already taken by another | ||
| product. | ||
| """ | ||
|
|
||
| from decimal import Decimal | ||
|
|
||
| from .storage import ( # noqa: F401 | ||
| from .storage import ( | ||
| NAME_INDEX, | ||
| PRODUCT_ID_INDEX, | ||
| PRODUCT_ID_MIN, | ||
| Product, | ||
| ) | ||
| from .utils import normalize_price, normalize_product_name # noqa: F401 | ||
| from .utils import normalize_price, normalize_product_name | ||
|
|
||
|
|
||
| def generate_product_id(storage: list[Product]) -> int: | ||
| """Choose the identifier for the next product added to ``storage``. | ||
|
|
||
| Args: | ||
| storage: The product store to inspect. | ||
|
|
||
| Returns: | ||
| One past the greatest identifier currently held in ``storage``, or | ||
| :data:`~src.part3.storage.PRODUCT_ID_MIN` when ``storage`` is | ||
| empty. | ||
| """ | ||
| # TODO: реализуйте функцию (используйте своё решение части 2) | ||
| return 0 | ||
| if not storage: | ||
| return PRODUCT_ID_MIN | ||
| return max(p[PRODUCT_ID_INDEX] for p in storage) + 1 | ||
|
|
||
|
|
||
| def create_product( | ||
| storage: list[Product], fields: tuple[str, Decimal, int] | ||
| ) -> int | None: | ||
| """Append a new product to ``storage`` and return its new identifier. | ||
|
|
||
| Args: | ||
| storage: The product store to append to; modified in place on | ||
| success. | ||
| fields: A ``(name, price, quantity)`` tuple describing the product. | ||
| ``name`` is normalised (surrounding whitespace stripped, | ||
| lower-cased) before it is stored or compared. ``price`` is a | ||
| :class:`~decimal.Decimal` amount and is rounded to the stored | ||
| money precision before it is saved. | ||
|
|
||
| Returns: | ||
| The identifier generated for the new product, or ``None`` when | ||
| ``name`` is blank once normalised or a product with the same | ||
| normalised name already exists. In the ``None`` case ``storage`` | ||
| is left unchanged and an explanatory message is printed. | ||
| """ | ||
| # TODO: реализуйте функцию | ||
| return 0 | ||
| raw_name, price, qty = fields | ||
| name = normalize_product_name(raw_name) | ||
| if not name: | ||
| print("product name must not be blank") | ||
| return None | ||
| for p in storage: | ||
| if p[NAME_INDEX] == name: | ||
| print(f"product name '{name}' is already taken") | ||
| return None | ||
| new_id = generate_product_id(storage) | ||
| norm_price = normalize_price(price) | ||
| storage.append((new_id, name, norm_price, qty)) | ||
| return new_id | ||
|
|
||
|
|
||
| def read_product(storage: list[Product], product_id: int) -> Product | None: | ||
| """Return the product stored under ``product_id``. | ||
|
|
||
| Args: | ||
| storage: The product store to search. | ||
| product_id: The identifier to look up. | ||
|
|
||
| Returns: | ||
| The matching ``(product_id, name, price, quantity)`` record, or | ||
| ``None`` when no product carries that identifier (a message is | ||
| printed in that case). | ||
| """ | ||
| # TODO: реализуйте функцию (используйте своё решение части 2) | ||
| return (0, "", Decimal(0), 0) | ||
| for p in storage: | ||
| if p[PRODUCT_ID_INDEX] == product_id: | ||
| return p | ||
| print(f"no product with id {product_id}") | ||
| return None | ||
|
|
||
|
|
||
| def update_product( | ||
| storage: list[Product], | ||
| product_id: int, | ||
| fields: tuple[str, Decimal, int], | ||
| ) -> Product | None: | ||
| """Overwrite the fields of the product stored under ``product_id``. | ||
|
|
||
| The identifier itself is preserved; only ``name``, ``price`` and | ||
| ``quantity`` are replaced. | ||
|
|
||
| Args: | ||
| storage: The product store to modify; the matching record is | ||
| replaced in place on success. | ||
| product_id: The identifier of the product to change. | ||
| fields: A ``(name, price, quantity)`` tuple with the new values. | ||
| ``price`` is a :class:`~decimal.Decimal` amount and is rounded | ||
| to the stored money precision before it is saved. | ||
|
|
||
| Returns: | ||
| The updated ``(product_id, name, price, quantity)`` record, or | ||
| ``None`` when ``name`` is blank once normalised, no product | ||
| carries that identifier, or the normalised name is already taken | ||
| by another product. In every ``None`` case ``storage`` is left | ||
| unchanged and an explanatory message is printed. Renaming a | ||
| product to its own current name is allowed. | ||
| """ | ||
| # TODO: реализуйте функцию | ||
| return (0, "", Decimal(0), 0) | ||
| raw_name, price, qty = fields | ||
| name = normalize_product_name(raw_name) | ||
| if not name: | ||
| print("product name must not be blank") | ||
| return None | ||
| target_idx = -1 | ||
|
|
||
| for i, p in enumerate(storage): | ||
| if p[PRODUCT_ID_INDEX] == product_id: | ||
| target_idx = i | ||
| break | ||
| if target_idx == -1: | ||
| print(f"no product with id {product_id}") | ||
| return None | ||
|
|
||
| for p in storage: | ||
| if p[NAME_INDEX] == name and p[PRODUCT_ID_INDEX] != product_id: | ||
| print(f"product name '{name}' is already taken") | ||
| return None | ||
| norm_price = normalize_price(price) | ||
| update_tuple = (product_id, name, norm_price, qty) | ||
| storage[target_idx] = update_tuple | ||
| return update_tuple | ||
|
|
||
|
|
||
| def delete_product(storage: list[Product], product_id: int) -> int | None: | ||
| """Remove the product stored under ``product_id`` from ``storage``. | ||
|
|
||
| Args: | ||
| storage: The product store to remove from; modified in place on | ||
| success. | ||
| product_id: The identifier of the product to remove. | ||
|
|
||
| Returns: | ||
| ``product_id`` when a product was removed, or ``None`` when no | ||
| product carried that identifier (``storage`` is left unchanged and | ||
| a message is printed). | ||
| """ | ||
| # TODO: реализуйте функцию (используйте своё решение части 2) | ||
| return 0 | ||
| for i, p in enumerate(storage): | ||
| if p[PRODUCT_ID_INDEX] == product_id: | ||
| storage.pop(i) | ||
| return product_id | ||
| return None | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. При отсутствии товара с переданным ID вы просто возвращаете |
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p- неинформативное имя. В языке нет никакого устоявшегося соглашения о физическом смысле данного имени. Другим разработчикам будет тяжело считать, назначение этой переменной.Нарушение критерия
M2. Минус 0.5 балла