prediction-market-agent-tooling 0.36.0__py3-none-any.whl → 0.37.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27,6 +27,7 @@ class APIKeys(BaseSettings):
27
27
  BET_FROM_PRIVATE_KEY: t.Optional[PrivateKey] = None
28
28
  SAFE_ADDRESS: t.Optional[ChecksumAddress] = None
29
29
  OPENAI_API_KEY: t.Optional[SecretStr] = None
30
+ GRAPH_API_KEY: t.Optional[SecretStr] = None
30
31
 
31
32
  GOOGLE_SEARCH_API_KEY: t.Optional[SecretStr] = None
32
33
  GOOGLE_SEARCH_ENGINE_ID: t.Optional[SecretStr] = None
@@ -72,6 +73,12 @@ class APIKeys(BaseSettings):
72
73
  self.OPENAI_API_KEY, "OPENAI_API_KEY missing in the environment."
73
74
  )
74
75
 
76
+ @property
77
+ def graph_api_key(self) -> SecretStr:
78
+ return check_not_none(
79
+ self.GRAPH_API_KEY, "GRAPH_API_KEY missing in the environment."
80
+ )
81
+
75
82
  @property
76
83
  def google_search_api_key(self) -> SecretStr:
77
84
  return check_not_none(
@@ -10,7 +10,6 @@ from prediction_market_agent_tooling.gtypes import (
10
10
  ChecksumAddress,
11
11
  HexAddress,
12
12
  HexStr,
13
- OmenOutcomeToken,
14
13
  OutcomeStr,
15
14
  Probability,
16
15
  Wei,
@@ -84,7 +83,6 @@ class OmenAgentMarket(AgentMarket):
84
83
  finalized_time: datetime | None
85
84
  created_time: datetime
86
85
  close_time: datetime
87
- outcome_token_amounts: list[OmenOutcomeToken]
88
86
  fee: float # proportion, from 0 to 1
89
87
 
90
88
  INVALID_MARKET_ANSWER: HexStr = HexStr(
@@ -144,6 +142,7 @@ class OmenAgentMarket(AgentMarket):
144
142
  amount: BetAmount,
145
143
  omen_auto_deposit: bool = True,
146
144
  web3: Web3 | None = None,
145
+ api_keys: APIKeys | None = None,
147
146
  ) -> None:
148
147
  if not self.can_be_traded():
149
148
  raise ValueError(
@@ -153,7 +152,7 @@ class OmenAgentMarket(AgentMarket):
153
152
  raise ValueError(f"Omen bets are made in xDai. Got {amount.currency}.")
154
153
  amount_xdai = xDai(amount.amount)
155
154
  binary_omen_buy_outcome_tx(
156
- api_keys=APIKeys(),
155
+ api_keys=api_keys if api_keys is not None else APIKeys(),
157
156
  amount=amount_xdai,
158
157
  market=self,
159
158
  binary_outcome=outcome,
@@ -161,20 +160,34 @@ class OmenAgentMarket(AgentMarket):
161
160
  web3=web3,
162
161
  )
163
162
 
163
+ def buy_tokens(
164
+ self,
165
+ outcome: bool,
166
+ amount: TokenAmount,
167
+ web3: Web3 | None = None,
168
+ api_keys: APIKeys | None = None,
169
+ ) -> None:
170
+ return self.place_bet(
171
+ outcome=outcome,
172
+ amount=amount,
173
+ web3=web3,
174
+ api_keys=api_keys,
175
+ )
176
+
164
177
  def calculate_sell_amount_in_collateral(
165
- self, amount: TokenAmount, outcome: bool
178
+ self, amount: TokenAmount, outcome: bool, web3: Web3 | None = None
166
179
  ) -> xDai:
167
- if len(self.outcome_token_amounts) != 2:
168
- raise ValueError(
169
- f"Market {self.id} has {len(self.outcome_token_amounts)} "
170
- f"outcomes. This method only supports binary markets."
171
- )
172
- sell_index = self.yes_index if outcome else self.no_index
173
- other_index = self.no_index if outcome else self.yes_index
180
+ pool_balance = get_conditional_tokens_balance_for_market(
181
+ self, self.market_maker_contract_address_checksummed, web3=web3
182
+ )
183
+
184
+ sell_str = self.outcomes[self.yes_index if outcome else self.no_index]
185
+ other_str = self.outcomes[self.no_index if outcome else self.yes_index]
186
+
174
187
  collateral = calculate_sell_amount_in_collateral(
175
188
  shares_to_sell=amount.amount,
176
- holdings=wei_to_xdai(Wei(self.outcome_token_amounts[sell_index])),
177
- other_holdings=wei_to_xdai(Wei(self.outcome_token_amounts[other_index])),
189
+ holdings=wei_to_xdai(pool_balance[self.get_index_set(sell_str)]),
190
+ other_holdings=wei_to_xdai(pool_balance[self.get_index_set(other_str)]),
178
191
  fee=self.fee,
179
192
  )
180
193
  return xDai(collateral)
@@ -197,6 +210,7 @@ class OmenAgentMarket(AgentMarket):
197
210
  collateral = self.calculate_sell_amount_in_collateral(
198
211
  amount=amount,
199
212
  outcome=outcome,
213
+ web3=web3,
200
214
  )
201
215
  binary_omen_sell_outcome_tx(
202
216
  amount=collateral,
@@ -282,7 +296,6 @@ class OmenAgentMarket(AgentMarket):
282
296
  url=model.url,
283
297
  volume=wei_to_xdai(model.collateralVolume),
284
298
  close_time=model.close_time,
285
- outcome_token_amounts=model.outcomeTokenAmounts,
286
299
  fee=float(wei_to_xdai(model.fee)) if model.fee is not None else 0.0,
287
300
  )
288
301
 
@@ -462,8 +475,9 @@ def omen_buy_outcome_tx(
462
475
  for_address=from_address_checksummed, web3=web3
463
476
  )
464
477
  if auto_deposit and collateral_token_balance < amount_wei:
478
+ deposit_amount_wei = Wei(amount_wei - collateral_token_balance)
465
479
  collateral_token_contract.deposit(
466
- api_keys=api_keys, amount_wei=amount_wei, web3=web3
480
+ api_keys=api_keys, amount_wei=deposit_amount_wei, web3=web3
467
481
  )
468
482
  # Buy shares using the deposited xDai in the collateral token.
469
483
  market_contract.buy(
@@ -6,6 +6,7 @@ import tenacity
6
6
  from eth_typing import ChecksumAddress
7
7
  from subgrounds import FieldPath, Subgrounds
8
8
 
9
+ from prediction_market_agent_tooling.config import APIKeys
9
10
  from prediction_market_agent_tooling.gtypes import HexAddress, HexBytes, Wei, wei_type
10
11
  from prediction_market_agent_tooling.loggers import logger
11
12
  from prediction_market_agent_tooling.markets.agent_market import FilterBy, SortBy
@@ -29,13 +30,11 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
29
30
  Class responsible for handling interactions with Omen subgraphs (trades, conditionalTokens).
30
31
  """
31
32
 
32
- OMEN_TRADES_SUBGRAPH = "https://api.thegraph.com/subgraphs/name/protofire/omen-xdai"
33
- CONDITIONAL_TOKENS_SUBGRAPH = (
34
- "https://api.thegraph.com/subgraphs/name/gnosis/conditional-tokens-gc"
35
- )
36
- REALITYETH_GRAPH_URL = (
37
- "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-gnosis"
38
- )
33
+ OMEN_TRADES_SUBGRAPH = "https://gateway-arbitrum.network.thegraph.com/api/{graph_api_key}/subgraphs/id/9fUVQpFwzpdWS9bq5WkAnmKbNNcoBwatMR4yZq81pbbz"
34
+
35
+ CONDITIONAL_TOKENS_SUBGRAPH = "https://gateway-arbitrum.network.thegraph.com/api/{graph_api_key}/subgraphs/id/7s9rGBffUTL8kDZuxvvpuc46v44iuDarbrADBFw5uVp2"
36
+
37
+ REALITYETH_GRAPH_URL = "https://gateway-arbitrum.network.thegraph.com/api/{graph_api_key}/subgraphs/id/E7ymrCnNcQdAAgLbdFWzGE5mvr5Mb5T9VfT43FqA7bNh"
39
38
 
40
39
  INVALID_ANSWER = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
41
40
 
@@ -49,12 +48,24 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
49
48
  after=lambda x: logger.debug(f"query_json failed, {x.attempt_number=}."),
50
49
  )(self.sg.query_json)
51
50
 
51
+ keys = APIKeys()
52
+
52
53
  # Load the subgraph
53
- self.trades_subgraph = self.sg.load_subgraph(self.OMEN_TRADES_SUBGRAPH)
54
+ self.trades_subgraph = self.sg.load_subgraph(
55
+ self.OMEN_TRADES_SUBGRAPH.format(
56
+ graph_api_key=keys.graph_api_key.get_secret_value()
57
+ )
58
+ )
54
59
  self.conditional_tokens_subgraph = self.sg.load_subgraph(
55
- self.CONDITIONAL_TOKENS_SUBGRAPH
60
+ self.CONDITIONAL_TOKENS_SUBGRAPH.format(
61
+ graph_api_key=keys.graph_api_key.get_secret_value()
62
+ )
63
+ )
64
+ self.realityeth_subgraph = self.sg.load_subgraph(
65
+ self.REALITYETH_GRAPH_URL.format(
66
+ graph_api_key=keys.graph_api_key.get_secret_value()
67
+ )
56
68
  )
57
- self.realityeth_subgraph = self.sg.load_subgraph(self.REALITYETH_GRAPH_URL)
58
69
 
59
70
  def _get_fields_for_bets(self, bets_field: FieldPath) -> list[FieldPath]:
60
71
  markets = bets_field.fpmm
@@ -13,6 +13,10 @@ class Balances(BaseModel):
13
13
  xdai: xDai
14
14
  wxdai: xDai
15
15
 
16
+ @property
17
+ def total(self) -> xDai:
18
+ return xDai(self.xdai + self.wxdai)
19
+
16
20
 
17
21
  def get_balances(address: ChecksumAddress, web3: Web3 | None = None) -> Balances:
18
22
  if not web3:
@@ -0,0 +1,49 @@
1
+ import base64
2
+ import io
3
+ import typing as t
4
+
5
+ from PIL import Image
6
+ from PIL.Image import Image as ImageType
7
+
8
+ from prediction_market_agent_tooling.config import APIKeys
9
+ from prediction_market_agent_tooling.tools.utils import check_not_none
10
+
11
+
12
+ def generate_image(
13
+ prompt: str,
14
+ model: str = "dall-e-3",
15
+ size: t.Literal[
16
+ "256x256", "512x512", "1024x1024", "1792x1024", "1024x1792"
17
+ ] = "1024x1024",
18
+ quality: t.Literal["standard", "hd"] = "standard",
19
+ ) -> ImageType:
20
+ try:
21
+ from openai import OpenAI
22
+ except ImportError:
23
+ raise ImportError(
24
+ "openai not installed, please install extras `openai` to use this function."
25
+ )
26
+ response = (
27
+ OpenAI(
28
+ api_key=APIKeys().openai_api_key.get_secret_value(),
29
+ )
30
+ .images.generate(
31
+ model=model,
32
+ prompt=prompt,
33
+ size=size,
34
+ quality=quality,
35
+ response_format="b64_json",
36
+ n=1,
37
+ )
38
+ .data[0]
39
+ )
40
+ image = Image.open(
41
+ io.BytesIO(
42
+ base64.b64decode(
43
+ check_not_none(
44
+ response.b64_json, "Can't be none if response_format is b64_json."
45
+ )
46
+ )
47
+ )
48
+ )
49
+ return image
@@ -0,0 +1,30 @@
1
+ from PIL.Image import Image as ImageType
2
+
3
+ from prediction_market_agent_tooling.config import APIKeys
4
+ from prediction_market_agent_tooling.tools.image_gen.image_gen import generate_image
5
+
6
+
7
+ def rewrite_question_into_image_generation_prompt(question: str) -> str:
8
+ try:
9
+ from langchain_openai import ChatOpenAI
10
+ except ImportError:
11
+ raise ImportError(
12
+ "openai not installed, please install extras `langchain` to use this function."
13
+ )
14
+ llm = ChatOpenAI(
15
+ model="gpt-4-turbo",
16
+ temperature=0.0,
17
+ api_key=APIKeys().openai_api_key.get_secret_value(),
18
+ )
19
+ rewritten = str(
20
+ llm.invoke(
21
+ f"Rewrite this prediction market question '{question}' into a form that will generate nice thumbnail with DALL-E-3."
22
+ "The thumbnail should be catchy and visually appealing. With a large object in the center of the image."
23
+ ).content
24
+ )
25
+ return rewritten
26
+
27
+
28
+ def generate_image_for_market(question: str) -> ImageType:
29
+ prompt = rewrite_question_into_image_generation_prompt(question)
30
+ return generate_image(prompt)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: prediction-market-agent-tooling
3
- Version: 0.36.0
3
+ Version: 0.37.0
4
4
  Summary: Tools to benchmark, deploy and monitor prediction market agents.
5
5
  Author: Gnosis
6
6
  Requires-Python: >=3.10,<3.12
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3.10
9
9
  Classifier: Programming Language :: Python :: 3.11
10
10
  Provides-Extra: google
11
11
  Provides-Extra: langchain
12
+ Provides-Extra: openai
12
13
  Requires-Dist: autoflake (>=2.2.1,<3.0.0)
13
14
  Requires-Dist: cron-validator (>=1.0.8,<2.0.0)
14
15
  Requires-Dist: eth-account (>=0.8.0,<0.9.0)
@@ -25,6 +26,7 @@ Requires-Dist: langchain-openai (>=0.0.5,<0.0.6) ; extra == "langchain"
25
26
  Requires-Dist: langfuse (>=2.27.1,<3.0.0)
26
27
  Requires-Dist: loguru (>=0.7.2,<0.8.0)
27
28
  Requires-Dist: numpy (>=1.26.4,<2.0.0)
29
+ Requires-Dist: openai (>=1.0.0,<2.0.0) ; extra == "openai"
28
30
  Requires-Dist: prompt-toolkit (>=3.0.43,<4.0.0)
29
31
  Requires-Dist: pydantic (>=2.6.1,<3.0.0)
30
32
  Requires-Dist: pydantic-settings (>=2.1.0,<3.0.0)
@@ -11,7 +11,7 @@ prediction_market_agent_tooling/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-
11
11
  prediction_market_agent_tooling/benchmark/agents.py,sha256=HPIFJvackW110ch3UkktbxhU48gMRVo4gQse84Klhdc,4000
12
12
  prediction_market_agent_tooling/benchmark/benchmark.py,sha256=xiHKzZx5GHSsDerFHMZ9j_LXAXnSaITSvv67iPe3MEU,21095
13
13
  prediction_market_agent_tooling/benchmark/utils.py,sha256=iS1BzyXcCMfMm1Rx--1QCH0pHvBTblTndcDQFbTUJ2s,2897
14
- prediction_market_agent_tooling/config.py,sha256=yELIlzAm2yBwZzGRvHtHBZZV3NZy5CllJfo3chMQMo0,4297
14
+ prediction_market_agent_tooling/config.py,sha256=pTeV4mbvPmrS_MzmiBklg05_gtsR3pa9Id5HCS-AzKQ,4519
15
15
  prediction_market_agent_tooling/deploy/agent.py,sha256=h33uU97x3DjBy8INONtS1Hc5B-NnNDV6MENeeCp0qoA,10185
16
16
  prediction_market_agent_tooling/deploy/agent_example.py,sha256=tqXVA2HSFK3pdZ49tMmta8aKdJFT8JN8WeJ1akjrpBk,909
17
17
  prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
@@ -31,10 +31,10 @@ prediction_market_agent_tooling/markets/manifold/utils.py,sha256=cPPFWXm3vCYH1jy
31
31
  prediction_market_agent_tooling/markets/markets.py,sha256=w05Oo7yCA2axpCw69Q9y4i9Gcdpht0u5bZGbWqld3rU,2964
32
32
  prediction_market_agent_tooling/markets/omen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
33
33
  prediction_market_agent_tooling/markets/omen/data_models.py,sha256=EXtjmcujx68Xu50BVkYXvLuf_Asx5o65RvFS3ZS6HGs,14405
34
- prediction_market_agent_tooling/markets/omen/omen.py,sha256=aJ5CCste61B7q0OD3EjLP8H7AjD_RaBBNyUfnZGh5KM,33597
34
+ prediction_market_agent_tooling/markets/omen/omen.py,sha256=fS19WoDG_N8WIa5FY-YRF21Np46y6d93QBJOpNKXi7Q,33939
35
35
  prediction_market_agent_tooling/markets/omen/omen_contracts.py,sha256=eDS8vN4Klv_-Y1wwfIeLDt3twhl9U_AJjPQov0JScb0,19888
36
36
  prediction_market_agent_tooling/markets/omen/omen_resolving.py,sha256=g77QsQ5WnSI2rzBlX87L_EhWMwobkyXyfRhHQmpAdzo,9012
37
- prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=RlaQMDF75lo2fos8LUb_OAdrw_ILLOXQLdejzE7tOmA,23053
37
+ prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py,sha256=2y89FJlDrJ_hpeNTFZU1W30xCpt8QXjssEW8bNZnEpU,23596
38
38
  prediction_market_agent_tooling/markets/polymarket/api.py,sha256=HXmA1akA0qDj0m3e-GEvWG8x75pm6BX4H7YJPQcST7I,4767
39
39
  prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=9CJzakyEcsn6DQBK2nOXjOMzTZBLAmK_KqevXvW17DI,4292
40
40
  prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=f8SRQy0Rn-gIHSEMrJJAI8H3J7l8lzOLj3aCMe0vJv8,11324
@@ -48,7 +48,7 @@ prediction_market_agent_tooling/monitor/monitor.py,sha256=uJdaEpGWp4VcejoQLF0uOx
48
48
  prediction_market_agent_tooling/monitor/monitor_app.py,sha256=rDxgdDJqSK0ARx0TJFMkS76npkHZJz0__Rp0xTpiRok,4611
49
49
  prediction_market_agent_tooling/monitor/monitor_settings.py,sha256=Xiozs3AsufuJ04JOe1vjUri-IAMWHjjmc2ugGGiHNH4,947
50
50
  prediction_market_agent_tooling/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
51
- prediction_market_agent_tooling/tools/balances.py,sha256=efDKEe-SsuSmGWKuGNiuHEWCGuCrcwjrCdTz1iKFtqw,749
51
+ prediction_market_agent_tooling/tools/balances.py,sha256=nR8_dSfbm3yTOOmMAwhGlurftEiNo1w1WIVzbskjdmM,837
52
52
  prediction_market_agent_tooling/tools/betting_strategies/kelly_criterion.py,sha256=IbhQPoKsQnjnag_n_wAL12n8QdCe7tAMRNV2QS8yYxY,3520
53
53
  prediction_market_agent_tooling/tools/betting_strategies/market_moving.py,sha256=wtrHVQRuA0uDx06z0OxQLYbswuOpHQ1UyCWwLCrD_oM,4400
54
54
  prediction_market_agent_tooling/tools/betting_strategies/minimum_bet_to_win.py,sha256=-FUSuQQgjcWSSnoFxnlAyTeilY6raJABJVM2QKkFqAY,438
@@ -59,6 +59,8 @@ prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_o
59
59
  prediction_market_agent_tooling/tools/gnosis_rpc.py,sha256=_MYSoyOR2MgAJkop1ERf8RhLum-M8S6OjaAsaqUW41w,203
60
60
  prediction_market_agent_tooling/tools/google.py,sha256=SfVDxb3oEOUK8mpd0l3mTX9ybrdrTPNM6HjfJ7kfNjA,1794
61
61
  prediction_market_agent_tooling/tools/hexbytes_custom.py,sha256=Bp94qgPjvjWf1Vb4lNzGFDXRdThw1rJ91vL6r2PWq5E,2096
62
+ prediction_market_agent_tooling/tools/image_gen/image_gen.py,sha256=HzRwBx62hOXBOmrtpkXaP9Qq1Ku03uUGdREocyjLQ_k,1266
63
+ prediction_market_agent_tooling/tools/image_gen/market_thumbnail_gen.py,sha256=svEu-oJNVuqpPpA7JjPEz3s1yM1_DgVf4M6gu90YKMQ,1110
62
64
  prediction_market_agent_tooling/tools/is_predictable.py,sha256=yRSkmu4lZqrSje9QGpnyWTFmdCnRvClfaFDHE2Zf9G4,2936
63
65
  prediction_market_agent_tooling/tools/parallelism.py,sha256=8mgkF5sBwFGS5GMvlpzam82Y3p2swPYuNsywpQuy-a4,1508
64
66
  prediction_market_agent_tooling/tools/safe.py,sha256=h0xOO0eNtitClf0fPkn-0oTc6A_bflDTee98V_aiV-A,5195
@@ -66,8 +68,8 @@ prediction_market_agent_tooling/tools/singleton.py,sha256=CiIELUiI-OeS7U7eeHEt0r
66
68
  prediction_market_agent_tooling/tools/streamlit_user_login.py,sha256=NXEqfjT9Lc9QtliwSGRASIz1opjQ7Btme43H4qJbzgE,3010
67
69
  prediction_market_agent_tooling/tools/utils.py,sha256=-G22UEbCRm59bm1RWFdeF55hRsaxgwZVAHvK32-Ye1g,6190
68
70
  prediction_market_agent_tooling/tools/web3_utils.py,sha256=cboATXNmEdn5RmPbVblHOwOdUMKBYrUK3GiI6i6Vzxo,9855
69
- prediction_market_agent_tooling-0.36.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
70
- prediction_market_agent_tooling-0.36.0.dist-info/METADATA,sha256=qmWuCtdncca0d6UJlarbVMkbgW15JBQojVPh1ZKz1bY,7513
71
- prediction_market_agent_tooling-0.36.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
72
- prediction_market_agent_tooling-0.36.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
73
- prediction_market_agent_tooling-0.36.0.dist-info/RECORD,,
71
+ prediction_market_agent_tooling-0.37.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
72
+ prediction_market_agent_tooling-0.37.0.dist-info/METADATA,sha256=CaelrPuw-JpZ4VVfKQTy8v8pdKTeWPLrqnEfhqRFHJg,7595
73
+ prediction_market_agent_tooling-0.37.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
74
+ prediction_market_agent_tooling-0.37.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
75
+ prediction_market_agent_tooling-0.37.0.dist-info/RECORD,,