diff --git a/src/part1/constants.py b/src/part1/constants.py index 9abfbba2..f3458cca 100644 --- a/src/part1/constants.py +++ b/src/part1/constants.py @@ -19,20 +19,19 @@ # Все константы, зависящие от ёмкостей *_BITS, должны вычисляться из них. # Twitter's original Snowflake epoch: 2010-11-04 01:42:54.657 UTC. -EPOCH_MS_DEFAULT: Final[int] = 0 +EPOCH_MS_DEFAULT: Final[int] = 1288834974657 # Node identifier used when the caller does not supply one. -NODE_ID_DEFAULT: Final[int] = 0 +NODE_ID_DEFAULT: Final[int] = 1 # Width of each field, in bits. -TIMESTAMP_BITS: Final[int] = 0 -NODE_ID_BITS: Final[int] = 0 -SEQUENCE_ID_BITS: Final[int] = 0 +TIMESTAMP_BITS: Final[int] = 41 +NODE_ID_BITS: Final[int] = 10 +SEQUENCE_ID_BITS: Final[int] = 12 # Largest value each field can hold. -TIMESTAMP_MS_MAX: Final[int] = 0 -NODE_ID_MAX: Final[int] = 0 -SEQUENCE_ID_MAX: Final[int] = 0 - +TIMESTAMP_MS_MAX: Final[int] = 2**TIMESTAMP_BITS - 1 +NODE_ID_MAX: Final[int] = 2**NODE_ID_BITS - 1 +SEQUENCE_ID_MAX: Final[int] = 2**SEQUENCE_ID_BITS - 1 # Здесь можно добавить собственные вспомогательные константы # (например, сдвиги полей при сборке идентификатора). diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index d3abf050..45f9962a 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -13,13 +13,16 @@ :func:`decode_node_id` and :func:`decode_sequence_id`. """ -import time # noqa: F401 +import time -from .constants import ( # noqa: F401 +from .constants import ( EPOCH_MS_DEFAULT, + NODE_ID_BITS, NODE_ID_DEFAULT, NODE_ID_MAX, + SEQUENCE_ID_BITS, SEQUENCE_ID_MAX, + TIMESTAMP_BITS, TIMESTAMP_MS_MAX, ) @@ -35,7 +38,7 @@ def read_current_millis(epoch_ms: int) -> int: negative if ``epoch_ms`` lies in the future. """ # TODO: реализуйте функцию - return 0 + return int(time.time() * 1000 - epoch_ms) def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: @@ -51,7 +54,8 @@ def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> generated. """ # TODO: реализуйте функцию - return 0 + timestamp_ms = (snowflake_id >> 22) & (2**TIMESTAMP_BITS - 1) + return int(timestamp_ms + epoch_ms) def decode_node_id(snowflake_id: int) -> int: @@ -65,7 +69,7 @@ def decode_node_id(snowflake_id: int) -> int: ``[0, NODE_ID_MAX]``. """ # TODO: реализуйте функцию - return 0 + return int((snowflake_id >> 12) & (2**NODE_ID_BITS - 1)) def decode_sequence_id(snowflake_id: int) -> int: @@ -79,7 +83,7 @@ def decode_sequence_id(snowflake_id: int) -> int: the range ``[0, SEQUENCE_ID_MAX]``. """ # TODO: реализуйте функцию - return 0 + return int(snowflake_id & (2**SEQUENCE_ID_BITS - 1)) def generate_snowflake_id( @@ -111,4 +115,17 @@ def generate_snowflake_id( cases an explanatory message is printed to stdout first. """ # TODO: реализуйте функцию - return 0 + if node_id < 0 or NODE_ID_MAX < node_id: + print(f"node_id must be in [{0}; {NODE_ID_MAX}]") + + if 0 < sequence_id or sequence_id < SEQUENCE_ID_MAX: + print(f"node_id must be in [{0}; {NODE_ID_MAX}]") + + timestamp_ms = int(time.time() * 1000 - epoch_ms) + if timestamp_ms > TIMESTAMP_MS_MAX: + print("overflows") + return None + + snowflake_id = (0b0 << 63) | (timestamp_ms << 22) | (node_id << 12) | (sequence_id) + + return int(snowflake_id) diff --git a/src/part2/cart.py b/src/part2/cart.py index 063f9aea..fcbe7e8d 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -11,8 +11,8 @@ from typing import Final -from .crud import read_product, update_product # noqa: F401 -from .storage import ( # noqa: F401 +from .crud import read_product, update_product +from .storage import ( NAME_INDEX, PRICE_INDEX, QUANTITY_INDEX, @@ -24,7 +24,17 @@ # TODO: задайте позиции полей внутри кортежа CartLine LINE_PRODUCT_ID_INDEX: Final = 0 -LINE_QUANTITY_INDEX: Final = 0 +LINE_QUANTITY_INDEX: Final = 1 + + +def find_cart_line( + cart: list[CartLine], + product_id: int, +) -> CartLine | None: + for line in cart: + if line[LINE_PRODUCT_ID_INDEX] == product_id: + return line + return None def add_to_cart( @@ -54,7 +64,36 @@ def add_to_cart( when the product is unknown or the store cannot cover the request. """ # TODO: реализуйте функцию - return (0, 0) + + product = read_product(storage, product_id) + if product is None: + return None + + stock_quantity = product[QUANTITY_INDEX] + if stock_quantity < quantity: + print( + f"not enough stock for product {product_id}: {stock_quantity} available, {quantity} requested" + ) + return None + + new_stock_quantity = stock_quantity - quantity + update_product( + storage, + product_id, + (product[NAME_INDEX], product[PRICE_INDEX], new_stock_quantity), + ) + + index = 0 + for line in cart: + if line[LINE_PRODUCT_ID_INDEX] == product_id: + updated_product = (product_id, line[LINE_PRODUCT_ID_INDEX] + quantity) + cart[index] = updated_product + return updated_product + + new_line = (product_id, quantity) + cart.append(new_line) + + return new_line def remove_from_cart( @@ -86,4 +125,33 @@ def remove_from_cart( line for the product or holds too few units. """ # TODO: реализуйте функцию - return (0, 0) + line = find_cart_line(cart, product_id) + if line is None: + print(f"product {product_id} is not in the cart") + return None + + cart_quantity = line[LINE_QUANTITY_INDEX] + if cart_quantity < quantity: + print( + f"cart holds only {cart_quantity} unit(s) of product <{product_id}, cannot remove {quantity}" + ) + return None + product = read_product(storage, product_id) + if product is None: + return None + update_product( + storage, + product_id, + (product[NAME_INDEX], product[PRICE_INDEX], product[QUANTITY_INDEX] + quantity), + ) + + new_quantity = cart_quantity - quantity + for index in range(len(cart)): + if cart[index][LINE_PRODUCT_ID_INDEX] == product_id: + if new_quantity == 0: + del cart[index] + return (product_id, 0) + updated_product = (product_id, new_quantity) + cart[index] = updated_product + return updated_product + return None diff --git a/src/part2/crud.py b/src/part2/crud.py index d026cbcb..9da32673 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -14,13 +14,13 @@ 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 # noqa: F401 +from .utils import normalize_price def generate_product_id(storage: list[Product]) -> int: @@ -35,7 +35,9 @@ def generate_product_id(storage: list[Product]) -> int: empty. """ # TODO: реализуйте функцию - return 0 + if not storage: + return PRODUCT_ID_MIN + return max(product[PRODUCT_ID_INDEX] for product in storage) + 1 def create_product( @@ -57,7 +59,17 @@ def create_product( name is printed. """ # TODO: реализуйте функцию - return 0 + name, price, quantity = fields + + for product in storage: + if product[NAME_INDEX] == name: + print(f"product name '{name}' is already taken.") + return None + + product_id = generate_product_id(storage) + normalized_price = normalize_price(price) + storage.append((product_id, name, normalized_price, quantity)) + return product_id def read_product(storage: list[Product], product_id: int) -> Product | None: @@ -73,7 +85,11 @@ def read_product(storage: list[Product], product_id: int) -> Product | None: printed in that case). """ # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + for product in storage: + if product[PRODUCT_ID_INDEX] == product_id: + return product + print(f"no product with id {product_id}") + return None def update_product( @@ -99,8 +115,18 @@ def update_product( ``None`` when no product carries that identifier (``storage`` is left unchanged and a message is printed). """ + name, price, quantity = fields + normalized_price = normalize_price(price) + # TODO: реализуйте функцию - return (0, "", Decimal(0), 0) + + for index, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + updated_product = (product_id, name, normalized_price, quantity) + storage[index] = updated_product + return updated_product + print(f"no product with id {product_id}") + return None def delete_product(storage: list[Product], product_id: int) -> int | None: @@ -117,4 +143,9 @@ def delete_product(storage: list[Product], product_id: int) -> int | None: a message is printed). """ # TODO: реализуйте функцию - return 0 + for index, product in enumerate(storage): + if product[PRODUCT_ID_INDEX] == product_id: + del storage[index] + return product_id + print(f"no product with id {product_id}") + return None diff --git a/src/part2/storage.py b/src/part2/storage.py index b63d5fc7..35821c5f 100644 --- a/src/part2/storage.py +++ b/src/part2/storage.py @@ -26,9 +26,9 @@ # TODO: задайте позиции полей внутри кортежа Product PRODUCT_ID_INDEX: Final = 0 -NAME_INDEX: Final = 0 -PRICE_INDEX: Final = 0 -QUANTITY_INDEX: Final = 0 +NAME_INDEX: Final = 1 +PRICE_INDEX: Final = 2 +QUANTITY_INDEX: Final = 3 # TODO: задайте идентификатор первого товара в пустом хранилище -PRODUCT_ID_MIN: Final[int] = 0 +PRODUCT_ID_MIN: Final[int] = 1 diff --git a/src/part2/utils.py b/src/part2/utils.py index 11bd7a76..2b6aa266 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -6,13 +6,13 @@ currency values free of binary floating-point error. """ -from decimal import ROUND_HALF_UP, Decimal # noqa: F401 +from decimal import ROUND_HALF_UP, Decimal from typing import Final # TODO: задайте число знаков после запятой и шаг квантования -PRICE_PRECISION: Final[int] = 0 -PRICE_STEP: Final = Decimal(0) +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) def normalize_price(price: Decimal) -> Decimal: @@ -26,4 +26,4 @@ def normalize_price(price: Decimal) -> Decimal: with halves rounded up. """ # TODO: реализуйте функцию - return Decimal(0) + return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP) diff --git a/src/part4/cart.py b/src/part4/cart.py index aed9bb72..a0ff3822 100644 --- a/src/part4/cart.py +++ b/src/part4/cart.py @@ -9,7 +9,8 @@ an explanatory message to stdout and returns ``None``. """ -from .storage import Product +from .crud import read_product, update_product +from .storage import QUANTITY_KEY, Product # TODO: при необходимости добавьте свои вспомогательные функции @@ -47,7 +48,29 @@ def add_to_cart( request. """ # TODO: реализуйте функцию - return 0 + storage_product = read_product(storage, product_id) + if storage_product is None: + return None + + if storage_product[QUANTITY_KEY] < quantity: + print( + f"not enough stock for product {product_id}: " + f"{storage_product[QUANTITY_KEY]} available, {quantity} requested" + ) + return None + + update_product( + storage, + product_names, + product_id, + {QUANTITY_KEY: storage_product[QUANTITY_KEY] - quantity}, + ) + + if product_id in cart: + cart[product_id] += quantity + else: + cart[product_id] = quantity + return cart[product_id] def remove_from_cart( @@ -84,4 +107,28 @@ def remove_from_cart( the cart does not hold the product or holds too few units. """ # TODO: реализуйте функцию - return 0 + + if product_id not in cart: + print(f"product {product_id} is not in the cart") + return None + if cart[product_id] < quantity: + print( + f"cart holds only {cart[product_id]} unit(s) " + f"of product {product_id}, cannot remove {quantity}" + ) + return None + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + update_product( + storage, + product_names, + product_id, + {QUANTITY_KEY: storage[product_id][QUANTITY_KEY] + quantity}, + ) + cart[product_id] -= quantity + if cart[product_id] == 0: + del cart[product_id] + return 0 + return cart[product_id] diff --git a/src/part4/crud.py b/src/part4/crud.py index 471eff00..acefee1b 100644 --- a/src/part4/crud.py +++ b/src/part4/crud.py @@ -23,16 +23,16 @@ than a scan over ``storage.values()``. """ -import uuid # noqa: F401 +import uuid from typing import Any -from .storage import ( # noqa: F401 +from .storage import ( NAME_KEY, PRICE_KEY, QUANTITY_KEY, Product, ) -from .utils import normalize_price, normalize_product_name # noqa: F401 +from .utils import normalize_price, normalize_product_name def generate_product_id() -> str: @@ -42,7 +42,7 @@ def generate_product_id() -> str: A freshly generated UUID, stringified. """ # TODO: реализуйте функцию - return "" + return str(uuid.uuid4()) def create_product( @@ -74,7 +74,23 @@ def create_product( message is printed. """ # TODO: реализуйте функцию - return "" + normalized_name = normalize_product_name(fields[NAME_KEY]) + + if not normalized_name: + print("product name must not be blank") + return None + if normalized_name in product_names: + print(f"product name '{normalized_name}' is already taken") + return None + + ID = generate_product_id() + storage[ID] = { + NAME_KEY: normalized_name, + PRICE_KEY: normalize_price(fields[PRICE_KEY]), + QUANTITY_KEY: fields[QUANTITY_KEY], + } + product_names.add(normalized_name) + return ID def read_product(storage: dict[str, Product], product_id: str) -> Product | None: @@ -89,7 +105,10 @@ def read_product(storage: dict[str, Product], product_id: str) -> Product | None that identifier (a message is printed in that case). """ # TODO: реализуйте функцию - return {} + if product_id not in storage: + print(f"no product with id {product_id}") + return None + return storage[product_id] def update_product( @@ -130,7 +149,28 @@ def update_product( own current name is allowed. """ # TODO: реализуйте функцию - return {} + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + if NAME_KEY in fields: + if not fields[NAME_KEY]: + print("product name must not be blank") + return None + if ( + fields[NAME_KEY] != storage[product_id][NAME_KEY] + and fields[NAME_KEY] in product_names + ): + print(f"product name '{fields[NAME_KEY]}' is already taken") + return None + product_names.remove(storage[product_id][NAME_KEY]) + product_names.add(fields[NAME_KEY]) + storage[product_id][NAME_KEY] = fields[NAME_KEY] + + if PRICE_KEY in fields: + fields[PRICE_KEY] = normalize_price(fields[PRICE_KEY]) + + return storage[product_id] def delete_product( @@ -154,4 +194,11 @@ def delete_product( are left unchanged and a message is printed). """ # TODO: реализуйте функцию - return "" + if product_id not in storage: + print(f"no product with id {product_id}") + return None + + storage_new = storage.pop(product_id) + product_names.remove(storage_new[NAME_KEY]) + + return product_id diff --git a/src/part4/run_admin.py b/src/part4/run_admin.py index 2247b29b..7b866b30 100644 --- a/src/part4/run_admin.py +++ b/src/part4/run_admin.py @@ -28,22 +28,33 @@ is left untouched and the loop keeps running; only ``exit`` stops it. """ -from decimal import Decimal, InvalidOperation # noqa: F401 +from decimal import Decimal, InvalidOperation from typing import Final -from .crud import ( # noqa: F401 +from .crud import ( create_product, delete_product, read_product, update_product, ) -from .storage import NAME_KEY, PRICE_KEY, QUANTITY_KEY, Product # noqa: F401 -from .utils import get_storage_str_representation # noqa: F401 +from .storage import NAME_KEY, PRICE_KEY, QUANTITY_KEY, Product +from .utils import get_storage_str_representation # TODO: задайте приглашение и текст справки (используйте своё решение части 3) -PROMPT: Final[str] = "" -HELP_TEXT: Final[str] = "" +PROMPT: Final[str] = "admin> " +HELP_TEXT: Final[str] = """Available commands: + help show this message + exit leave the console + show print the whole store as a table + create add a product, print its new id + read print the product with that id + update overwrite that product's fields + delete remove the product with that id + +For create and update the price and quantity are the last two words of the +line; everything before them is the product name, so it may contain spaces +(for example "Gibson SG Junior") and needs no quoting.""" def show_help() -> None: @@ -54,6 +65,7 @@ def show_help() -> None: note on how multi-word names are parsed. """ # TODO: реализуйте функцию (используйте своё решение части 3) + print(HELP_TEXT) def print_result(result: object) -> None: @@ -65,6 +77,8 @@ def print_result(result: object) -> None: printed in that case. """ # TODO: реализуйте функцию (используйте своё решение части 3) + if result is not None: + print(result) def run_command( @@ -92,7 +106,59 @@ def run_command( ``update`` does not parse as a decimal number. """ # TODO: реализуйте функцию - return False + parts = line.split() + if not parts: + print(f"'{line}' is not a command") + return True + + actions = parts[0] + + match actions: + case "help" if len(parts) == 1: + show_help() + return True + + case "exit" if len(parts) == 1: + return False + + case "show" if len(parts) == 1: + print_result(get_storage_str_representation(storage)) + return True + + case "create" if len(parts) >= 4: + name = " ".join(parts[1:-2]) + price = Decimal(parts[-2]) + quantity = int(parts[-1]) + fields = {NAME_KEY: name, PRICE_KEY: price, QUANTITY_KEY: quantity} + created_id = create_product(storage, product_names, fields) + print_result(created_id) + return True + + case "read" if len(parts) == 2: + product_id = parts[1] + result_read = read_product(storage, product_id) + print_result(result_read) + return True + + case "delete" if len(parts) == 2: + product_id = parts[1] + result_delete = delete_product(storage, product_names, product_id) + print_result(result_delete) + return True + + case "update" if len(parts) >= 5: + product_id = parts[1] + name = " ".join(parts[2:-2]) + price = Decimal(parts[-2]) + quantity = int(parts[-1]) + fields = {NAME_KEY: name, PRICE_KEY: price, QUANTITY_KEY: quantity} + updated_prod = update_product(storage, product_names, product_id, fields) + print_result(updated_prod) + return True + + case _: + print(f"'{line}' is not a command") + return True def main() -> None: diff --git a/src/part4/storage.py b/src/part4/storage.py index 9acedf07..a25f6253 100644 --- a/src/part4/storage.py +++ b/src/part4/storage.py @@ -40,6 +40,6 @@ # Name of each field inside a Product record. # TODO: задайте имена полей записи -NAME_KEY: Final = "" -PRICE_KEY: Final = "" -QUANTITY_KEY: Final = "" +NAME_KEY: Final = "name" +PRICE_KEY: Final = "price" +QUANTITY_KEY: Final = "quantity" diff --git a/src/part4/utils.py b/src/part4/utils.py index d2a940ea..5b620460 100644 --- a/src/part4/utils.py +++ b/src/part4/utils.py @@ -18,10 +18,10 @@ the longest value it holds in that particular call. """ -from decimal import ROUND_HALF_UP, Decimal # noqa: F401 +from decimal import ROUND_HALF_UP, Decimal from typing import Final -from .storage import ( # noqa: F401 +from .storage import ( NAME_KEY, PRICE_KEY, QUANTITY_KEY, @@ -33,14 +33,14 @@ # Quantisation step derived from PRICE_PRECISION, e.g. Decimal("0.01"). # TODO: задайте число знаков после запятой и шаг квантования (используйте своё # решение части 3) -PRICE_PRECISION: Final[int] = 0 -PRICE_STEP: Final = Decimal(0) +PRICE_PRECISION: Final[int] = 2 +PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION) # Column headers of the table produced by get_storage_str_representation, # left to right. The width of each column is not fixed here -- it is # measured per call from the data (see the function). # TODO: задайте заголовки столбцов таблицы (используйте своё решение части 3) -TABLE_HEADERS: Final[tuple[str, ...]] = () +TABLE_HEADERS: Final[tuple[str, ...]] = ("ID", "name", "price", "quantity") def normalize_price(price: Decimal) -> Decimal: @@ -54,7 +54,7 @@ def normalize_price(price: Decimal) -> Decimal: with halves rounded up. """ # TODO: реализуйте функцию (используйте своё решение части 3) - return Decimal(0) + return price.quantize(PRICE_STEP, ROUND_HALF_UP) def normalize_product_name(name: str) -> str: @@ -72,10 +72,18 @@ def normalize_product_name(name: str) -> str: whitespace. """ # TODO: реализуйте функцию (используйте своё решение части 3) - return "" + names = name.split() + normalized_names = "".join(names).lower() + return normalized_names # TODO: при необходимости добавьте свои вспомогательные функции +def separate(lengths: tuple[int, ...]) -> str: + sep = "|" + for length in lengths: + sep += "-" + "-" * length + "-|" + sep += "\n" + return sep def get_storage_str_representation(storage: dict[str, Product]) -> str: @@ -97,4 +105,23 @@ def get_storage_str_representation(storage: dict[str, Product]) -> str: returned, sized to the header labels. """ # TODO: реализуйте функцию (используйте своё решение части 3) - return "" + rows = [] + for ID, data in storage.items(): + rows.append(ID, data[NAME_KEY], str(data[PRICE_KEY]), str(data[QUANTITY_KEY])) + widths = [] + for i, header in enumerate(TABLE_HEADERS): + max_len = len(header) + for row in rows: + max_len = max(max_len, len(row[i])) + widths.append(max_len) + + def format_row(values: tuple[str, ...]) -> str: + return "|" + "".join( + " " + values[i] + " " * (widths[i] - len(values[i])) + "|" + for i in range(len(values)) + ) + + table_header = format_row(TABLE_HEADERS) + separator = separate(tuple(widths)).rstrip("\n") + lines = [format_row(row) for row in rows] + return "\n".join([table_header, separator, *lines])