Adjust types of optional arguments

MOD Adjust types of optional arguments

myfitnesspal/client.py

@@ -827,19 +827,19 @@ def set_new_food(
  fat: float,
  carbs: float,
  protein: float,
- sodium: float = 0,
- potassium: float = 0,
- saturated_fat: float = 0,
- polyunsaturated_fat: float = 0,
- fiber: float = 0,
- monounsaturated_fat: float = 0,
- sugar: float = 0,
- trans_fat: float = 0,
- cholesterol: float = 0,
- vitamin_a: float = 0,
- calcium: float = 0,
- vitamin_c: float = 0,
- iron: float = 0,
+ sodium: Optional[float] = None,
+ potassium: Optional[float] = None,
+ saturated_fat: Optional[float] = None,
+ polyunsaturated_fat: Optional[float] = None,
+ fiber: Optional[float] = None,
+ monounsaturated_fat: Optional[float] = None,
+ sugar: Optional[float] = None,
+ trans_fat: Optional[float] = None,
+ cholesterol: Optional[float] = None,
+ vitamin_a: Optional[float] = None,
+ calcium: Optional[float] = None,
+ vitamin_c: Optional[float] = None,
+ iron: Optional[float] = None,
  serving_size: str = "1 Serving",
  servingspercontainer: float = 1.0,
  sharepublic: bool = False,
@@ -904,22 +904,22 @@ def set_new_food(
  "weight[serving_size]": serving_size,
  "servingspercontainer": f"{servingspercontainer}",
  "nutritional_content[calories]": f"{calories}",
- "nutritional_content[sodium]": f"{sodium}",
+ "nutritional_content[sodium]": f"{sodium or ''}",
  "nutritional_content[fat]": f"{fat}",
- "nutritional_content[potassium]": f"{potassium}",
- "nutritional_content[saturated_fat]": f"{saturated_fat}",
+ "nutritional_content[potassium]": f"{potassium or ''}",
+ "nutritional_content[saturated_fat]": f"{saturated_fat or ''}",
  "nutritional_content[carbs]": f"{carbs}",
- "nutritional_content[polyunsaturated_fat]": f"{polyunsaturated_fat}",
- "nutritional_content[fiber]": f"{fiber}",
- "nutritional_content[monounsaturated_fat]": f"{monounsaturated_fat}",
- "nutritional_content[sugar]": f"{sugar}",
- "nutritional_content[trans_fat]": f"{trans_fat}",
+ "nutritional_content[polyunsaturated_fat]": f"{polyunsaturated_fat or ''}",
+ "nutritional_content[fiber]": f"{fiber or ''}",
+ "nutritional_content[monounsaturated_fat]": f"{monounsaturated_fat or ''}",
+ "nutritional_content[sugar]": f"{sugar or ''}",
+ "nutritional_content[trans_fat]": f"{trans_fat or ''}",
  "nutritional_content[protein]": f"{protein}",
- "nutritional_content[cholesterol]": f"{cholesterol}",
- "nutritional_content[vitamin_a]": f"{vitamin_a}",
- "nutritional_content[calcium]": f"{calcium}",
- "nutritional_content[vitamin_c]": f"{vitamin_c}",
- "nutritional_content[iron]": f"{iron}",
+ "nutritional_content[cholesterol]": f"{cholesterol or ''}",
+ "nutritional_content[vitamin_a]": f"{vitamin_a or ''}",
+ "nutritional_content[calcium]": f"{calcium or ''}",
+ "nutritional_content[vitamin_c]": f"{vitamin_c or ''}",
+ "nutritional_content[iron]": f"{iron or ''}",
  "food_entry[quantity]": "1.0",
  "food_entry[meal_id]": "0",
  "addtodiary": "no",
@@ -961,21 +961,20 @@ def set_new_goal(
  self,
  energy: float,
  energy_unit: str = "calories",
- carbohydrates: float = None,
- protein: float = None,
- fat: float = None,
- percent_carbohydrates: float = None,
- percent_protein: float = None,
- percent_fat: float = None,
+ carbohydrates: Optional[float] = None,
+ protein: Optional[float] = None,
+ fat: Optional[float] = None,
+ percent_carbohydrates: fOptional[float] = None,
+ percent_protein: Optional[float] = None,
+ percent_fat: Optional[float] = None,
  ) -> None:
  """Updates your nutrition goals.
 
  This Function will update your nutrition goals and is able to deal with multiple situations based on the passed arguments.
  First matching situation will be applied and used to update the nutrition goals.
 
  Passed arguments - Hints:
- energy and all absolute macro values - Energy will be adjusted if calculated energy from macro values is higher than provided energy value.
- absolute macro values - Energy value will be calculated with provided macro values.
+ energy and all absolute macro values - Energy value will be adjusted/calculated if energy from macro values is higher than provided energy value.
  energy and all percentage macro values - Energy will be adjusted and split into macros by provided percentage.
  energy - Energy will be adjusted and split into macros by percentage as before.