Vidhiii1711 commited on
Commit
04437e7
Β·
1 Parent(s): 0954052

Updated some files again and changes the structure of project

Browse files
my_env/server/Dockerfile β†’ Dockerfile RENAMED
File without changes
my_env/inference.py β†’ inference.py RENAMED
@@ -24,14 +24,16 @@ import os
24
  import sys
25
  import json
26
  import argparse
27
-
 
28
  from openai import OpenAI
 
29
 
30
  # ─────────────────────────────────────────────────────────────
31
  # CREDENTIALS β€” read from environment variables (mandatory)
32
  # ─────────────────────────────────────────────────────────────
33
 
34
- API_BASE_URL = os.environ.get("API_BASE_URL", "https://api-inference.huggingface.co/v1")
35
  MODEL_NAME = os.environ.get("MODEL_NAME", "meta-llama/Llama-3.3-70B-Instruct")
36
  HF_TOKEN = os.environ.get("HF_TOKEN", "")
37
 
@@ -40,18 +42,14 @@ if not HF_TOKEN:
40
  print(" export HF_TOKEN='your_hf_token'", file=sys.stderr)
41
  sys.exit(1)
42
 
43
- # ─────────────────────────────────────────────────────────────
44
  # OpenAI-compatible client pointed at HF Inference API
45
- # ─────────────────────────────────────────────────────────────
46
 
47
  client = OpenAI(
48
  base_url=API_BASE_URL,
49
  api_key=HF_TOKEN,
50
  )
51
 
52
- # ─────────────────────────────────────────────────────────────
53
  # SYSTEM PROMPT β€” tells the LLM its role
54
- # ─────────────────────────────────────────────────────────────
55
 
56
  SYSTEM_PROMPT = """You are an expert AI agricultural advisor helping farmers in India manage crop irrigation.
57
 
@@ -82,9 +80,7 @@ Rules:
82
  4. Consider crop stage when deciding target moisture range
83
  """
84
 
85
- # ─────────────────────────────────────────────────────────────
86
  # LLM DECISION FUNCTION
87
- # ─────────────────────────────────────────────────────────────
88
 
89
  def llm_decide(observation: dict, task_id: int, day: int, max_days: int) -> tuple[str, str]:
90
  """
@@ -152,50 +148,41 @@ Respond ONLY with JSON: {{"action": "...", "reason": "..."}}"""
152
  print(f"[WARN] LLM call failed: {e}. Using fallback.", file=sys.stderr)
153
  return "medium", "Fallback: LLM call failed"
154
 
155
-
156
- # ─────────────────────────────────────────────────────────────
157
  # GRADERS (local import β€” same as in graders.py)
158
- # ─────────────────────────────────────────────────────────────
159
 
160
  def _import_graders():
161
  """Import grader functions from local graders.py."""
 
 
 
 
 
 
162
  try:
163
  from graders import grade_task1, grade_task2, grade_task3
164
  return grade_task1, grade_task2, grade_task3
165
- except ImportError:
166
- pass
167
- try:
168
- sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
169
- from graders import grade_task1, grade_task2, grade_task3
170
- return grade_task1, grade_task2, grade_task3
171
  except ImportError as e:
172
  print(f"[ERROR] Cannot import graders.py: {e}", file=sys.stderr)
173
  sys.exit(1)
174
 
175
-
176
- # ─────────────────────────────────────────────────────────────
177
  # ENVIRONMENT IMPORT
178
- # ─────────────────────────────────────────────────────────────
179
-
180
  def _import_env():
181
  """Import FarmEnvironment from local server module."""
 
 
 
 
 
 
 
182
  try:
183
  from server.my_env_environment import FarmEnvironment
184
  return FarmEnvironment
185
- except ImportError:
186
- pass
187
- try:
188
- sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
189
- from server.my_env_environment import FarmEnvironment
190
- return FarmEnvironment
191
  except ImportError as e:
192
  print(f"[ERROR] Cannot import FarmEnvironment: {e}", file=sys.stderr)
193
  sys.exit(1)
194
 
195
-
196
- # ─────────────────────────────────────────────────────────────
197
  # RUN ONE TASK
198
- # ─────────────────────────────────────────────────────────────
199
 
200
  def run_task(env, task_id: int, city: str = "Indore") -> dict:
201
  """
@@ -212,7 +199,7 @@ def run_task(env, task_id: int, city: str = "Indore") -> dict:
212
  max_steps = config["max_steps"]
213
  task_name = config["name"]
214
 
215
- # ── [START] log β€” required by hackathon ──────────────────
216
  print(json.dumps({
217
  "event": "START",
218
  "task_id": task_id,
@@ -256,6 +243,7 @@ def run_task(env, task_id: int, city: str = "Indore") -> dict:
256
  "crop_stage": obs_dict["crop_stage"],
257
  }
258
  episode_history.append(record)
 
259
 
260
  # ── [STEP] log β€” required by hackathon ───────────────
261
  print(json.dumps({
@@ -290,6 +278,7 @@ def run_task(env, task_id: int, city: str = "Indore") -> dict:
290
  "day_number": result.day_number,
291
  "crop_stage": result.crop_stage.value,
292
  }
 
293
 
294
  # Grade the episode
295
  grade_task1, grade_task2, grade_task3 = _import_graders()
@@ -315,11 +304,7 @@ def run_task(env, task_id: int, city: str = "Indore") -> dict:
315
  "episode_history": episode_history,
316
  }
317
 
318
-
319
- # ─────────────────────────────────────────────────────────────
320
  # MAIN
321
- # ─────────────────────────────────────────────────────────────
322
-
323
  def main(city: str = "Indore", task_id: int = None):
324
  """
325
  Run LLM agent through all 3 tasks (or a specific task).
 
24
  import sys
25
  import json
26
  import argparse
27
+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "my_env"))
28
+ sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
29
  from openai import OpenAI
30
+ import time
31
 
32
  # ─────────────────────────────────────────────────────────────
33
  # CREDENTIALS β€” read from environment variables (mandatory)
34
  # ─────────────────────────────────────────────────────────────
35
 
36
+ API_BASE_URL = os.environ.get("API_BASE_URL", "https://router.huggingface.co/v1")
37
  MODEL_NAME = os.environ.get("MODEL_NAME", "meta-llama/Llama-3.3-70B-Instruct")
38
  HF_TOKEN = os.environ.get("HF_TOKEN", "")
39
 
 
42
  print(" export HF_TOKEN='your_hf_token'", file=sys.stderr)
43
  sys.exit(1)
44
 
 
45
  # OpenAI-compatible client pointed at HF Inference API
 
46
 
47
  client = OpenAI(
48
  base_url=API_BASE_URL,
49
  api_key=HF_TOKEN,
50
  )
51
 
 
52
  # SYSTEM PROMPT β€” tells the LLM its role
 
53
 
54
  SYSTEM_PROMPT = """You are an expert AI agricultural advisor helping farmers in India manage crop irrigation.
55
 
 
80
  4. Consider crop stage when deciding target moisture range
81
  """
82
 
 
83
  # LLM DECISION FUNCTION
 
84
 
85
  def llm_decide(observation: dict, task_id: int, day: int, max_days: int) -> tuple[str, str]:
86
  """
 
148
  print(f"[WARN] LLM call failed: {e}. Using fallback.", file=sys.stderr)
149
  return "medium", "Fallback: LLM call failed"
150
 
 
 
151
  # GRADERS (local import β€” same as in graders.py)
 
152
 
153
  def _import_graders():
154
  """Import grader functions from local graders.py."""
155
+ root_dir = os.path.dirname(os.path.abspath(__file__))
156
+ my_env_dir = os.path.join(root_dir, "my_env")
157
+
158
+ sys.path.insert(0, root_dir)
159
+ sys.path.insert(0, my_env_dir)
160
+
161
  try:
162
  from graders import grade_task1, grade_task2, grade_task3
163
  return grade_task1, grade_task2, grade_task3
 
 
 
 
 
 
164
  except ImportError as e:
165
  print(f"[ERROR] Cannot import graders.py: {e}", file=sys.stderr)
166
  sys.exit(1)
167
 
 
 
168
  # ENVIRONMENT IMPORT
 
 
169
  def _import_env():
170
  """Import FarmEnvironment from local server module."""
171
+ # Add my_env to path since inference.py runs from project root
172
+ root_dir = os.path.dirname(os.path.abspath(__file__))
173
+ my_env_dir = os.path.join(root_dir, "my_env")
174
+
175
+ sys.path.insert(0, root_dir)
176
+ sys.path.insert(0, my_env_dir)
177
+
178
  try:
179
  from server.my_env_environment import FarmEnvironment
180
  return FarmEnvironment
 
 
 
 
 
 
181
  except ImportError as e:
182
  print(f"[ERROR] Cannot import FarmEnvironment: {e}", file=sys.stderr)
183
  sys.exit(1)
184
 
 
 
185
  # RUN ONE TASK
 
186
 
187
  def run_task(env, task_id: int, city: str = "Indore") -> dict:
188
  """
 
199
  max_steps = config["max_steps"]
200
  task_name = config["name"]
201
 
202
+ # ── [START] log β€” required by hackathon
203
  print(json.dumps({
204
  "event": "START",
205
  "task_id": task_id,
 
243
  "crop_stage": obs_dict["crop_stage"],
244
  }
245
  episode_history.append(record)
246
+ time.sleep(1.5)
247
 
248
  # ── [STEP] log β€” required by hackathon ───────────────
249
  print(json.dumps({
 
278
  "day_number": result.day_number,
279
  "crop_stage": result.crop_stage.value,
280
  }
281
+ time.sleep(1.5)
282
 
283
  # Grade the episode
284
  grade_task1, grade_task2, grade_task3 = _import_graders()
 
304
  "episode_history": episode_history,
305
  }
306
 
 
 
307
  # MAIN
 
 
308
  def main(city: str = "Indore", task_id: int = None):
309
  """
310
  Run LLM agent through all 3 tasks (or a specific task).
my_env/__pycache__/graders.cpython-313.pyc CHANGED
Binary files a/my_env/__pycache__/graders.cpython-313.pyc and b/my_env/__pycache__/graders.cpython-313.pyc differ
 
my_env/server/__pycache__/my_env_environment.cpython-313.pyc CHANGED
Binary files a/my_env/server/__pycache__/my_env_environment.cpython-313.pyc and b/my_env/server/__pycache__/my_env_environment.cpython-313.pyc differ
 
my_env/server/my_env_environment.py CHANGED
@@ -117,86 +117,85 @@ class FarmEnvironment(Environment):
117
  )
118
 
119
  def step(self, action: FarmAction) -> FarmObservation:
120
- """
121
- Execute one day of farming.
122
- AI provides water_amount, environment updates accordingly.
123
- """
124
- self._state.step_count += 1
125
-
126
- # --- Water Amount Mapping ---
127
- water_map = {
128
- "none": 0,
129
- "low": 10,
130
- "medium": 25,
131
- "high": 50,
132
- }
133
- water_added = water_map.get(action.water_amount.value, 0)
134
-
135
- # --- Use real historical weather for each day ---
136
- weather = self._weather_service.get_historical_weather(
137
- self._city, self._day
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
138
  )
139
- self._temperature = weather["temperature"]
140
- self._rainfall = weather["rainfall"]
141
 
142
- # --- Update Soil Moisture ---
143
- if self._sensor_moisture is not None:
144
- # sensor user β€” just add water and subtract evaporation
145
- evaporation = (self._temperature / 100) * 10
146
- self._soil_moisture = self._soil_moisture + water_added - evaporation
147
- else:
148
- # no sensor β€” use weather calculator
149
- self._soil_moisture = self._weather_service.calculate_soil_moisture(
150
- current_moisture=self._soil_moisture + water_added,
151
- temperature=self._temperature,
152
- rainfall=self._rainfall
153
- )
154
 
155
- # Keep moisture in valid range 0-100
156
- self._soil_moisture = max(0.0, min(100.0, self._soil_moisture))
157
-
158
- # --- Update Crop Health based on moisture ---
159
- if self._soil_moisture < 20 or self._soil_moisture > 90:
160
- # Very wrong moisture β€” health degrades
161
- health_order = ["poor", "fair", "good", "excellent"]
162
- current_idx = health_order.index(self._crop_health.value)
163
- new_idx = max(0, current_idx - 1)
164
- self._crop_health = CropHealthStatus(health_order[new_idx])
165
- elif 40 <= self._soil_moisture <= 75:
166
- # Good moisture β€” health improves
167
- health_order = ["poor", "fair", "good", "excellent"]
168
- current_idx = health_order.index(self._crop_health.value)
169
- new_idx = min(3, current_idx + 1)
170
- self._crop_health = CropHealthStatus(health_order[new_idx])
171
- # else: moisture is okay but not ideal β€” health stays same
172
-
173
- # --- Advance Day ---
174
- self._day += 1
175
-
176
- # --- Auto Update Crop Stage based on day ---
177
- if self._day <= 10:
178
- self._crop_stage = CropStage.SEEDLING
179
- elif self._day <= 20:
180
- self._crop_stage = CropStage.GROWING
181
- else:
182
- self._crop_stage = CropStage.MATURE
183
 
184
- # --- Calculate Reward ---
185
- reward = self._calculate_reward(water_added)
 
 
 
 
 
 
 
186
 
187
- # --- Is episode done? ---
188
- done = self._day > 30
189
 
190
- return FarmObservation(
191
- temperature=self._temperature,
192
- rainfall=self._rainfall,
193
- soil_moisture=self._soil_moisture,
194
- crop_health=self._crop_health,
195
- day_number=min(self._day, 30),
196
- crop_stage=self._crop_stage,
197
- done=done,
198
- reward=reward,
199
- )
 
 
 
 
 
 
 
 
 
 
 
 
 
 
200
 
201
  def _calculate_reward(self, water_added: float) -> float:
202
  """
 
117
  )
118
 
119
  def step(self, action: FarmAction) -> FarmObservation:
120
+ """
121
+ Execute one day of farming.
122
+ AI provides water_amount, environment updates accordingly.
123
+ """
124
+ self._state.step_count += 1
125
+
126
+ # --- Water Amount Mapping ---
127
+ water_map = {
128
+ "none": 0,
129
+ "low": 10,
130
+ "medium": 25,
131
+ "high": 50,
132
+ }
133
+ water_added = water_map.get(action.water_amount.value, 0)
134
+
135
+ # --- Use real historical weather for each day ---
136
+ weather = self._weather_service.get_historical_weather(
137
+ self._city, self._day
138
+ )
139
+ self._temperature = weather["temperature"]
140
+ self._rainfall = weather["rainfall"]
141
+
142
+ # --- Update Soil Moisture ---
143
+ if self._sensor_moisture is not None:
144
+ # sensor user β€” just add water and subtract evaporation
145
+ evaporation = (self._temperature / 100) * 10
146
+ self._soil_moisture = self._soil_moisture + water_added - evaporation
147
+ else:
148
+ # no sensor β€” use weather calculator
149
+ self._soil_moisture = self._weather_service.calculate_soil_moisture(
150
+ current_moisture=self._soil_moisture + water_added,
151
+ temperature=self._temperature,
152
+ rainfall=self._rainfall
153
  )
 
 
154
 
155
+ # Keep moisture in valid range 0-100
156
+ self._soil_moisture = max(0.0, min(100.0, self._soil_moisture))
 
 
 
 
 
 
 
 
 
 
157
 
158
+ # --- Update Crop Health based on moisture ---
159
+ health_order = ["poor", "fair", "good", "excellent"]
160
+ current_idx = health_order.index(self._crop_health.value)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
161
 
162
+ if self._soil_moisture < 20 or self._soil_moisture > 90:
163
+ # Very wrong moisture β€” health degrades
164
+ new_idx = max(0, current_idx - 1)
165
+ self._crop_health = CropHealthStatus(health_order[new_idx])
166
+ elif 40 <= self._soil_moisture <= 75:
167
+ # Good moisture β€” health improves
168
+ new_idx = min(3, current_idx + 1)
169
+ self._crop_health = CropHealthStatus(health_order[new_idx])
170
+ # else: moisture okay but not ideal β€” health stays same
171
 
172
+ # --- Advance Day ---
173
+ self._day += 1
174
 
175
+ # --- Auto Update Crop Stage based on day ---
176
+ if self._day <= 10:
177
+ self._crop_stage = CropStage.SEEDLING
178
+ elif self._day <= 20:
179
+ self._crop_stage = CropStage.GROWING
180
+ else:
181
+ self._crop_stage = CropStage.MATURE
182
+
183
+ # --- Calculate Reward ---
184
+ reward = self._calculate_reward(water_added)
185
+
186
+ # --- Is episode done? ---
187
+ done = self._day > 30
188
+
189
+ return FarmObservation(
190
+ temperature=self._temperature,
191
+ rainfall=self._rainfall,
192
+ soil_moisture=self._soil_moisture,
193
+ crop_health=self._crop_health,
194
+ day_number=min(self._day, 30),
195
+ crop_stage=self._crop_stage,
196
+ done=done,
197
+ reward=reward,
198
+ )
199
 
200
  def _calculate_reward(self, water_added: float) -> float:
201
  """
my_env/openenv.yaml β†’ openenv.yaml RENAMED
File without changes
openenv_my_env.egg-info/PKG-INFO ADDED
@@ -0,0 +1,9 @@
 
 
 
 
 
 
 
 
 
 
1
+ Metadata-Version: 2.4
2
+ Name: openenv-my_env
3
+ Version: 0.1.0
4
+ Summary: My Env environment for OpenEnv
5
+ Requires-Python: >=3.10
6
+ Requires-Dist: openenv-core[core]>=0.2.1
7
+ Provides-Extra: dev
8
+ Requires-Dist: pytest>=8.0.0; extra == "dev"
9
+ Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
openenv_my_env.egg-info/SOURCES.txt ADDED
@@ -0,0 +1,18 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ README.md
2
+ pyproject.toml
3
+ my_env/__init__.py
4
+ my_env/baseline.py
5
+ my_env/client.py
6
+ my_env/graders.py
7
+ my_env/models.py
8
+ my_env/tasks.py
9
+ my_env/weather.py
10
+ my_env/server/__init__.py
11
+ my_env/server/app.py
12
+ my_env/server/my_env_environment.py
13
+ openenv_my_env.egg-info/PKG-INFO
14
+ openenv_my_env.egg-info/SOURCES.txt
15
+ openenv_my_env.egg-info/dependency_links.txt
16
+ openenv_my_env.egg-info/entry_points.txt
17
+ openenv_my_env.egg-info/requires.txt
18
+ openenv_my_env.egg-info/top_level.txt
openenv_my_env.egg-info/dependency_links.txt ADDED
@@ -0,0 +1 @@
 
 
1
+
openenv_my_env.egg-info/entry_points.txt ADDED
@@ -0,0 +1,2 @@
 
 
 
1
+ [console_scripts]
2
+ server = my_env.server.app:main
openenv_my_env.egg-info/requires.txt ADDED
@@ -0,0 +1,5 @@
 
 
 
 
 
 
1
+ openenv-core[core]>=0.2.1
2
+
3
+ [dev]
4
+ pytest>=8.0.0
5
+ pytest-cov>=4.0.0
openenv_my_env.egg-info/top_level.txt ADDED
@@ -0,0 +1 @@
 
 
1
+ my_env
my_env/pyproject.toml β†’ pyproject.toml RENAMED
@@ -42,4 +42,4 @@ server = "my_env.server.app:main"
42
  [tool.setuptools]
43
  include-package-data = true
44
  packages = ["my_env", "my_env.server"]
45
- package-dir = { "my_env" = ".", "my_env.server" = "server" }
 
42
  [tool.setuptools]
43
  include-package-data = true
44
  packages = ["my_env", "my_env.server"]
45
+ package-dir = { "my_env" = "my_env", "my_env.server" = "my_env/server" }
uv.lock ADDED
The diff for this file is too large to render. See raw diff